summaryrefslogtreecommitdiff
path: root/modules/gallery/libraries/Gallery_View.php
diff options
context:
space:
mode:
authorChad Parry <github@chad.parry.org>2011-04-24 08:28:39 -0600
committerChad Parry <github@chad.parry.org>2011-04-24 08:28:39 -0600
commit26585fed03236f0f70a75959e1d3002025f4e15e (patch)
tree33a89567f40dbbdb8affcbe76baa27b242bc6d75 /modules/gallery/libraries/Gallery_View.php
parent809567f12850f59bdeb47a2963f6968b99b5a201 (diff)
parentc8f90e861b866d0caa86343a6c7213e923023d39 (diff)
Merge branch 'master' of https://github.com/gallery/gallery3 into rawphoto
Diffstat (limited to 'modules/gallery/libraries/Gallery_View.php')
-rw-r--r--modules/gallery/libraries/Gallery_View.php3
1 files changed, 3 insertions, 0 deletions
diff --git a/modules/gallery/libraries/Gallery_View.php b/modules/gallery/libraries/Gallery_View.php
index 77e3d204..1395686c 100644
--- a/modules/gallery/libraries/Gallery_View.php
+++ b/modules/gallery/libraries/Gallery_View.php
@@ -136,6 +136,9 @@ class Gallery_View_Core extends View {
}
unset($this->combine_queue[$type][$group]);
+ if (empty($this->combine_queue[$type])) {
+ unset($this->combine_queue[$type]);
+ }
if ($type == "css") {
return html::stylesheet("combined/css/$key", "screen,print,projection", true);