summaryrefslogtreecommitdiff
path: root/modules
diff options
context:
space:
mode:
authorAndy Staudacher <andy.st@gmail.com>2009-06-29 20:21:25 -0700
committerAndy Staudacher <andy.st@gmail.com>2009-06-29 20:21:25 -0700
commite3b4c6a57747429033ad9fd3d4ee321b93dcc1ad (patch)
tree3e110f73136225c01bf1241b26b7ea557ccfe5ca /modules
parentfe668abcb3612ec1b769e8b976a0aec856c21426 (diff)
parentf5f74e3638e31517e7513a3d9cbda48d9806a904 (diff)
Merge branch 'master' of git@github.com:gallery/gallery3
Diffstat (limited to 'modules')
-rw-r--r--modules/gallery/libraries/Admin_View.php2
1 files changed, 1 insertions, 1 deletions
diff --git a/modules/gallery/libraries/Admin_View.php b/modules/gallery/libraries/Admin_View.php
index 58daf3d2..47770a90 100644
--- a/modules/gallery/libraries/Admin_View.php
+++ b/modules/gallery/libraries/Admin_View.php
@@ -98,7 +98,7 @@ class Admin_View_Core extends Gallery_View {
}
}
- if ($function == "head") {
+ if ($function == "admin_head") {
array_unshift($blocks, $this->combine_files($this->css, "css"));
array_unshift($blocks, $this->combine_files($this->scripts, "javascript"));
}