diff options
| author | Tim Almdal <tnalmdal@shaw.ca> | 2011-04-23 07:27:02 -0700 |
|---|---|---|
| committer | Tim Almdal <tnalmdal@shaw.ca> | 2011-04-23 07:27:02 -0700 |
| commit | a1f419435c755500bbd11cb6c48a5bb31f8e6421 (patch) | |
| tree | 1e673daeb106731abbfd4f8095011538a1c31fe8 /modules/gallery/libraries | |
| parent | 4b01676f323fb280ebaa4c041e6894cbb464d8fe (diff) | |
| parent | 33e4a995aa844ebb523ee85a1584ab0386129f7d (diff) | |
Merge branch 'master' of git@github.com:gallery/gallery3
Diffstat (limited to 'modules/gallery/libraries')
| -rw-r--r-- | modules/gallery/libraries/Gallery_View.php | 3 |
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); |