diff options
| author | colings <colings@example.com> | 2011-01-09 11:43:45 -0600 |
|---|---|---|
| committer | colings <colings@example.com> | 2011-01-09 11:43:45 -0600 |
| commit | 02a349f68ac480d5b1a630e14b4f2e3558328673 (patch) | |
| tree | 25bf25960b6811d8dbcbed6f6c9d63de7c03bd4e /modules/gallery/libraries/Admin_View.php | |
| parent | c2a1ea64eda2bf3e22ecaf4df4714c091bc5d7c4 (diff) | |
| parent | de5b06ae7442db2c7a8999c0c806997248ddb151 (diff) | |
Merge remote branch 'upstream/master'
Diffstat (limited to 'modules/gallery/libraries/Admin_View.php')
| -rw-r--r-- | modules/gallery/libraries/Admin_View.php | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/modules/gallery/libraries/Admin_View.php b/modules/gallery/libraries/Admin_View.php index bff13ace..28a003cc 100644 --- a/modules/gallery/libraries/Admin_View.php +++ b/modules/gallery/libraries/Admin_View.php @@ -34,11 +34,11 @@ class Admin_View_Core extends Gallery_View { $this->theme_name = Input::instance()->get("theme", $this->theme_name); } $this->sidebar = ""; - $this->set_global("theme", $this); - $this->set_global("user", identity::active_user()); - $this->set_global("page_type", "admin"); - $this->set_global("page_subtype", $name); - $this->set_global("page_title", null); + $this->set_global(array("theme" => $this, + "user" => identity::active_user(), + "page_type" => "admin", + "page_subtype" => $name, + "page_title" => null)); } public function admin_menu() { |