Merge branch 'master' of git@github.com:gallery/gallery3

1 files changed, 7 insertions, 0 deletions

diff --git a/modules/organize/controllers/organize.php b/modules/organize/controllers/organize.php
index de53c4ed..2b966657 100644
--- a/modules/organize/controllers/organize.php
+++ b/modules/organize/controllers/organize.php
@@ -136,6 +136,13 @@ class Organize_Controller extends Controller {
     $v = new View("organize_tree.html");
     $v->parents = $album->parents();
     $v->album = $album;
+
+    if ($album->id == 1) {
+      $v->peers = array($album);
+    } else {
+      $v->peers = $album->parent()->children(null, 0, array("type" => "album"));
+    }
+
     return $v;
   }
 }