Change ORM_MPTT::add_to_parent() to take an ORM instead of an id so

that it's consistent with ORM_MPTT::move_to()

2 files changed, 13 insertions, 3 deletions

diff --git a/core/helpers/album.php b/core/helpers/album.php
index 3e3b6054..83bbfbab 100644
--- a/core/helpers/album.php
+++ b/core/helpers/album.php
@@ -47,7 +47,12 @@ class album_Core {
       $album->name = "{$name}-" . rand();
     }
 
-    $album = $album->add_to_parent($parent_id);
+    $parent = ORM::factory("item", $parent_id);
+    if (!$parent->loaded) {
+      throw new Exception("@todo INVALID_PARENT_ID");
+    }
+
+    $album = $album->add_to_parent($parent);
     mkdir($album->file_path());
     $thumbnail_dir = dirname($album->thumbnail_path());
     if (!file_exists($thumbnail_dir)) {
diff --git a/core/helpers/photo.php b/core/helpers/photo.php
index 6d9887a4..0c098c84 100644
--- a/core/helpers/photo.php
+++ b/core/helpers/photo.php
@@ -69,7 +69,12 @@ class photo_Core {
     }
 
     // This saves the photo
-    $photo->add_to_parent($parent_id);
+    $parent = ORM::factory("item", $parent_id);
+    if (!$parent->loaded) {
+      throw new Exception("@todo INVALID_PARENT_ID");
+    }
+
+    $photo->add_to_parent($parent);
     copy($filename, $photo->file_path());
 
     // @todo: parameterize these dimensions
@@ -84,7 +89,7 @@ class photo_Core {
   }
 
   static function get_add_form($parent) {
-    $form = new Forge("albums/{$parent->id}", "", "post", 
+    $form = new Forge("albums/{$parent->id}", "", "post",
       array("id" => "gAddPhotoForm", "enctype" => "multipart/form-data"));
     $group = $form->group(sprintf(_("Add Photo to %s"), $parent->title));
     $group->input("name")->label(true);