summaryrefslogtreecommitdiff
path: root/modules/gallery/libraries/Gallery_View.php
diff options
context:
space:
mode:
authorChad Kieffer <ckieffer@gmail.com>2011-04-23 10:29:06 -0400
committerChad Kieffer <ckieffer@gmail.com>2011-04-23 10:29:06 -0400
commitc2abd476c74e37f8efbbcef58f6cb41bb3dca7d2 (patch)
tree1d417c9e181c4ce24370a81b3dec1d1b281e882f /modules/gallery/libraries/Gallery_View.php
parentbb23e28035293174f935345178f32638c09d0421 (diff)
parent7a4ff2fea194829eac38c6293b43cfa55d4637e1 (diff)
Merge branch 'master' of git://github.com/gallery/gallery3
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);