diff options
| author | Andy Staudacher <andy.st@gmail.com> | 2009-06-29 19:56:52 -0700 |
|---|---|---|
| committer | Andy Staudacher <andy.st@gmail.com> | 2009-06-29 19:56:52 -0700 |
| commit | 06172ecdb9e7a4acf158387c4804b6424e8b1b15 (patch) | |
| tree | 27e6e161eab1da274623634d7e511048b22b13cb /modules/gallery/libraries/Admin_View.php | |
| parent | 333c9d47e30125bcd7092adacedabaf1fcb417b6 (diff) | |
| parent | 8af19c0625eca7cd7360ebc1036cd654bdf88145 (diff) | |
Merge branch 'master' of git@github.com:gallery/gallery3
Diffstat (limited to 'modules/gallery/libraries/Admin_View.php')
| -rw-r--r-- | modules/gallery/libraries/Admin_View.php | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/modules/gallery/libraries/Admin_View.php b/modules/gallery/libraries/Admin_View.php index 01496c0d..58daf3d2 100644 --- a/modules/gallery/libraries/Admin_View.php +++ b/modules/gallery/libraries/Admin_View.php @@ -98,8 +98,9 @@ class Admin_View_Core extends Gallery_View { } } - if ($function == "admin_head") { - array_unshift($blocks, $this->combine_script()); + if ($function == "head") { + array_unshift($blocks, $this->combine_files($this->css, "css")); + array_unshift($blocks, $this->combine_files($this->scripts, "javascript")); } if (Session::instance()->get("debug")) { |