diff options
| author | Romain LE DISEZ <romain.git@ledisez.net> | 2009-06-24 23:02:57 +0200 |
|---|---|---|
| committer | Romain LE DISEZ <romain.git@ledisez.net> | 2009-06-24 23:02:57 +0200 |
| commit | 6111272568a732465c330597a068a048f6705ef9 (patch) | |
| tree | f8829dfb4c4ee566a69f91d397e74e74aec56dbd /modules/gallery/controllers/quick.php | |
| parent | de28b0350e5d5bf6c3e1eb5a9531298b08fd7cba (diff) | |
| parent | f56d372629df5b08a30d0182d4e1e7c97a44d79f (diff) | |
Merge commit 'upstream/master'
Conflicts:
modules/comment/helpers/comment_installer.php
modules/gallery/models/item.php
Diffstat (limited to 'modules/gallery/controllers/quick.php')
| -rw-r--r-- | modules/gallery/controllers/quick.php | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/modules/gallery/controllers/quick.php b/modules/gallery/controllers/quick.php index 6203728c..e89d9701 100644 --- a/modules/gallery/controllers/quick.php +++ b/modules/gallery/controllers/quick.php @@ -25,10 +25,10 @@ class Quick_Controller extends Controller { } $view = new View("quick_pane.html"); - $view->button_list = - gallery_quick::get_quick_buttons($item, Input::instance()->get("page_type")); + $page_type = Input::instance()->get("page_type"); + $view->button_list = gallery_quick::get_quick_buttons($item, $page_type); $view->item = $item; - $view->page_type = Input::instance()->get("page_type"); + $view->page_type = $page_type; print $view; } |