summaryrefslogtreecommitdiff
path: root/modules/gallery/libraries/Gallery_View.php
diff options
context:
space:
mode:
authorBharat Mediratta <bharat@menalto.com>2011-04-23 06:50:47 -0700
committerBharat Mediratta <bharat@menalto.com>2011-04-23 06:50:47 -0700
commitfa4fb20f8036745a4999d05ccb2fe285a891f3a8 (patch)
treea74c91b803d14c8be861c3af64c97d43f9652737 /modules/gallery/libraries/Gallery_View.php
parentea72cf15f0718bbe067efa0b6ff0f9bc2a3bc493 (diff)
If we've cleared out the last group in a combine_queue for a given
type, unset the combine_queue for that type entirely. This way future calls to css() and script() emit an element until there's a new call to start_combining(). Fixes 1685.
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);