From 0ff81c7ded9e61a16a2f900edfbe98d48847bf59 Mon Sep 17 00:00:00 2001
From: Bharat Mediratta <bharat@menalto.com>
Date: Mon, 9 Aug 2010 15:18:25 -0700
Subject: The root album's edit form doesn't have a name field, so don't count
 on it being there in update().  Fixes ticket #1281.

---
 modules/gallery/controllers/albums.php | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

(limited to 'modules/gallery/controllers/albums.php')

diff --git a/modules/gallery/controllers/albums.php b/modules/gallery/controllers/albums.php
index f3f5dee3..fb7d5c59 100644
--- a/modules/gallery/controllers/albums.php
+++ b/modules/gallery/controllers/albums.php
@@ -132,7 +132,9 @@ class Albums_Controller extends Items_Controller {
       $album->description = $form->edit_item->description->value;
       $album->sort_column = $form->edit_item->sort_order->column->value;
       $album->sort_order = $form->edit_item->sort_order->direction->value;
-      $album->name = $form->edit_item->inputs["name"]->value;
+      if (array_key_exists("name", $form->edit_item->inputs)) {
+        $album->name = $form->edit_item->inputs["name"]->value;
+      }
       $album->slug = $form->edit_item->slug->value;
       $album->validate();
     } catch (ORM_Validation_Exception $e) {
-- 
cgit v1.2.3


From 6a13a238bbd2dea9198ac4682faeba18eb6af4a9 Mon Sep 17 00:00:00 2001
From: Bharat Mediratta <bharat@menalto.com>
Date: Sun, 29 Aug 2010 11:45:27 -0700
Subject: Convert the "parents" variable from a result iterator to an array so
 that the theme can call empty() on it.  Fixes #1318.

---
 modules/gallery/controllers/albums.php | 2 +-
 modules/gallery/controllers/movies.php | 2 +-
 modules/gallery/controllers/photos.php | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

(limited to 'modules/gallery/controllers/albums.php')

diff --git a/modules/gallery/controllers/albums.php b/modules/gallery/controllers/albums.php
index fb7d5c59..b0887195 100644
--- a/modules/gallery/controllers/albums.php
+++ b/modules/gallery/controllers/albums.php
@@ -68,7 +68,7 @@ class Albums_Controller extends Items_Controller {
     $template->set_global("item", $album);
     $template->set_global("children", $album->viewable()->children($page_size, $offset));
     $template->set_global("children_count", $children_count);
-    $template->set_global("parents", $album->parents());
+    $template->set_global("parents", $album->parents()->as_array()); // view calls empty() on this
     $template->content = new View("album.html");
 
     // We can't use math in ORM or the query builder, so do this by hand.  It's important
diff --git a/modules/gallery/controllers/movies.php b/modules/gallery/controllers/movies.php
index 02d2a497..717eb8aa 100644
--- a/modules/gallery/controllers/movies.php
+++ b/modules/gallery/controllers/movies.php
@@ -41,7 +41,7 @@ class Movies_Controller extends Items_Controller {
     $template->set_global("item", $movie);
     $template->set_global("children", array());
     $template->set_global("children_count", 0);
-    $template->set_global("parents", $movie->parents());
+    $template->set_global("parents", $movie->parents()->as_array());
     $template->set_global("next_item", $next_item);
     $template->set_global("previous_item", $previous_item);
     $template->set_global("sibling_count", $movie->parent()->viewable()->children_count($where));
diff --git a/modules/gallery/controllers/photos.php b/modules/gallery/controllers/photos.php
index 8377e6c7..b22ac8e5 100644
--- a/modules/gallery/controllers/photos.php
+++ b/modules/gallery/controllers/photos.php
@@ -41,7 +41,7 @@ class Photos_Controller extends Items_Controller {
     $template->set_global("item", $photo);
     $template->set_global("children", array());
     $template->set_global("children_count", 0);
-    $template->set_global("parents", $photo->parents());
+    $template->set_global("parents", $photo->parents()->as_array());
     $template->set_global("next_item", $next_item);
     $template->set_global("previous_item", $previous_item);
     $template->set_global("sibling_count", $photo->parent()->viewable()->children_count($where));
-- 
cgit v1.2.3