diff options
| author | Nathan Kinkade <nkinkade@nkinka.de> | 2010-12-23 02:12:38 +0000 |
|---|---|---|
| committer | Nathan Kinkade <nkinkade@nkinka.de> | 2010-12-23 02:12:38 +0000 |
| commit | 5e17a5e7fcb678bd7081bdf8089afec5b25f3aff (patch) | |
| tree | 9590eae390af1f72b72ddc6500a2566e3558e3bb /modules/gallery/libraries/Theme_View.php | |
| parent | cf1965957c48b1c88a3913f8167688d03d191cec (diff) | |
| parent | 032e6fde5f99c3150a4ae70e410ce314d8c3877a (diff) | |
Merge branch 'master' of git://github.com/gallery/gallery3
Diffstat (limited to 'modules/gallery/libraries/Theme_View.php')
| -rw-r--r-- | modules/gallery/libraries/Theme_View.php | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/modules/gallery/libraries/Theme_View.php b/modules/gallery/libraries/Theme_View.php index 7a6bc1da..d22bb03a 100644 --- a/modules/gallery/libraries/Theme_View.php +++ b/modules/gallery/libraries/Theme_View.php @@ -284,8 +284,8 @@ class Theme_View_Core extends Gallery_View { if ($function == "head") { // Merge the theme CSS/JS at the end $this->css = array_merge($this->css, $save_css); - array_unshift($blocks, $this->combine_files($this->css, "css")); array_unshift($blocks, $this->combine_files($this->scripts, "javascript")); + array_unshift($blocks, $this->combine_files($this->css, "css")); } if (Session::instance()->get("debug")) { |