summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorStephan Bergemann <st.bergemann@htw-berlin.de>2012-06-14 19:38:43 +0200
committerStephan Bergemann <st.bergemann@htw-berlin.de>2012-06-14 19:38:43 +0200
commit4eb0c270aa902bd5d84edb2500f866fed4e6e9ab (patch)
tree7079d8338956300ac328ba3b971b4b772c5a3f27
parenta3afd51b9401ea03a50d7555ad724a64820c8674 (diff)
downloadnextcloud-server-4eb0c270aa902bd5d84edb2500f866fed4e6e9ab.tar.gz
nextcloud-server-4eb0c270aa902bd5d84edb2500f866fed4e6e9ab.zip
fixed handling of fallback_images
-rw-r--r--apps/gallery/templates/index.php5
1 files changed, 4 insertions, 1 deletions
diff --git a/apps/gallery/templates/index.php b/apps/gallery/templates/index.php
index 544875a9ef3..bf4f117c7de 100644
--- a/apps/gallery/templates/index.php
+++ b/apps/gallery/templates/index.php
@@ -109,8 +109,11 @@ for($i = 0; $i < count($images); $i++) {
}
if (count($dir_arr) == 2) { // These are the pics in our current subdir
$second_level_images[] = $root.$images[$i];
+ $fallback_images = array();
} else { // These are images from the deeper directories
- $fallback_images[] = $root.$images[$i];
+ if(count($second_level_images) == 0) {
+ $fallback_images[] = $root.$images[$i];
+ }
}
// have us a little something to compare against
$previous_element = $images[$i];