fixed bug #996: first picture in folder is repeated in the last position behaving...

Conflicts:
	apps/gallery/templates/index.php

diff --git a/apps/gallery/templates/index.php b/apps/gallery/templates/index.php
index 148c3df225997d72ed1be00d12c974c16b49ef96..e7b7f2e187e123c453e5b0dc09db950b5cf9c5a3 100644 (file)
--- a/apps/gallery/templates/index.php
+++ b/apps/gallery/templates/index.php
@@ -89,32 +89,32 @@ $second_level_images = array();
 $fallback_images = array(); // if the folder only cotains subfolders with images -> these are taken for the stack preview
 
 for($i = 0; $i < count($images); $i++) {
-        $prev_dir_arr = explode('/', $previous_element);
-        $dir_arr = explode('/', $images[$i]);
-
-        if(count($dir_arr) == 1) { // getting the images in this directory
-                $root_images[] = $root.$images[$i];
-        } else {
-                if(strcmp($prev_dir_arr[0], $dir_arr[0]) != 0) { // if we entered a new directory
-                        if(count($second_level_images) == 0) { // if we don't have images in this directory
-                                if(count($fallback_images) != 0) { // but have fallback_images
-                                        $tl->addTile(new \OC\Pictures\TileStack($fallback_images, $prev_dir_arr[0]));
-                                        $fallback_images = array();
-                                }
-                        } else { // if we collected images for this directory
-                                $tl->addTile(new \OC\Pictures\TileStack($second_level_images, $prev_dir_arr[0]));
-                                $fallback_images = array();
-                                $second_level_images = array();
-                        }
-                }
-                if (count($dir_arr) == 2) { // These are the pics in our current subdir
-                        $second_level_images[] = $root.$images[$i];
-                } else { // These are images from the deeper directories
-                        $fallback_images[] = $root.$images[$i];
-                }
-                // have us a little something to compare against
-                $previous_element = $images[$i];
-        }
+       $prev_dir_arr = explode('/', $previous_element);
+       $dir_arr = explode('/', $images[$i]);
+
+       if(count($dir_arr) == 1) { // getting the images in this directory
+               $root_images[] = $root.$images[$i];
+       } else {
+               if(strcmp($prev_dir_arr[0], $dir_arr[0]) != 0) { // if we entered a new directory
+                       if(count($second_level_images) == 0) { // if we don't have images in this directory
+                               if(count($fallback_images) != 0) { // but have fallback_images
+                                       $tl->addTile(new \OC\Pictures\TileStack($fallback_images, $prev_dir_arr[0]));
+                                       $fallback_images = array();
+                               }
+                       } else { // if we collected images for this directory
+                               $tl->addTile(new \OC\Pictures\TileStack($second_level_images, $prev_dir_arr[0]));
+                               $fallback_images = array();
+                               $second_level_images = array();
+                       }
+               }
+               if (count($dir_arr) == 2) { // These are the pics in our current subdir
+                       $second_level_images[] = $root.$images[$i];
+               } else { // These are images from the deeper directories
+                       $fallback_images[] = $root.$images[$i];
+               }
+               // have us a little something to compare against
+               $previous_element = $images[$i];
+       }
 }
 
 // if last element in the directory was a directory we don't want to miss it :)