diff options
| author | Bharat Mediratta <bharat@menalto.com> | 2009-07-02 18:00:22 -0700 |
|---|---|---|
| committer | Bharat Mediratta <bharat@menalto.com> | 2009-07-02 18:00:22 -0700 |
| commit | eb5538d1357dade9e6e08d1b603033928944011c (patch) | |
| tree | ee04f9be38a40f4125eafab5367bba6cf1b61164 /modules/digibug/helpers | |
| parent | 1a5fe42b555d51d22bde1521100a31d2b434486b (diff) | |
| parent | a633c134b754305eaa611c5d67af4ca7c79beafe (diff) | |
Merge branch 'master' of git@github.com:/gallery/gallery3
Conflicts:
modules/server_add/controllers/admin_server_add.php
Diffstat (limited to 'modules/digibug/helpers')
| -rw-r--r-- | modules/digibug/helpers/digibug_menu.php | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/modules/digibug/helpers/digibug_menu.php b/modules/digibug/helpers/digibug_menu.php index 4b8db5a2..f1d4fc1d 100644 --- a/modules/digibug/helpers/digibug_menu.php +++ b/modules/digibug/helpers/digibug_menu.php @@ -32,8 +32,7 @@ class digibug_menu { Menu::factory("link") ->id("digibug") ->label(t("Print with Digibug")) - ->url("javascript:digibug_popup('" . - url::site("digibug/print_photo/$item->id?csrf=$theme->csrf") . "')") + ->url(url::site("digibug/print_photo/$item->id?csrf=$theme->csrf")) ->css_id("gDigibugLink")); } @@ -43,8 +42,7 @@ class digibug_menu { Menu::factory("link") ->id("digibug") ->label(t("Print with Digibug")) - ->url("javascript:digibug_popup('" . - url::site("digibug/print_photo/$item->id?csrf=$theme->csrf") . "')") + ->url(url::site("digibug/print_photo/$item->id?csrf=$theme->csrf")) ->css_id("gDigibugLink")); } } |