summaryrefslogtreecommitdiff
path: root/modules/gallery
diff options
context:
space:
mode:
authorBharat Mediratta <bharat@menalto.com>2009-07-17 18:24:31 -0700
committerBharat Mediratta <bharat@menalto.com>2009-07-17 18:24:31 -0700
commitd692002bcfca1cc630ddd0e55b693744ef7fa924 (patch)
tree3b5d7c3d4312cdcc6c6b188aa4dbf62f9ef1454f /modules/gallery
parent6200955003844ba9a196db72f068650f8056acda (diff)
Don't show the combined CSS/JS elements if we didn't combine anything.
Fixes ticket #554.
Diffstat (limited to 'modules/gallery')
-rw-r--r--modules/gallery/libraries/Gallery_View.php4
1 files changed, 4 insertions, 0 deletions
diff --git a/modules/gallery/libraries/Gallery_View.php b/modules/gallery/libraries/Gallery_View.php
index 4b85f2f0..31231ca6 100644
--- a/modules/gallery/libraries/Gallery_View.php
+++ b/modules/gallery/libraries/Gallery_View.php
@@ -73,6 +73,10 @@ class Gallery_View_Core extends View {
protected function combine_files($files, $type) {
$links = array();
+ if (empty($files)) {
+ return;
+ }
+
// Include the url in the cache key so that if the Gallery moves, we don't use old cached
// entries.
$key = array(url::abs_file(""));