2 files changed, 14 insertions, 14 deletions

diff --git a/core/helpers/album.php b/core/helpers/album.php
index 53af0079..70b05006 100644
--- a/core/helpers/album.php
+++ b/core/helpers/album.php
@@ -32,7 +32,11 @@ class album_Core {
    * @param string  $description (optional) the longer description of this album
    * @return Item_Model
    */
-  static function create($parent_id, $name, $title, $description=null, $owner_id=null) {
+  static function create($parent, $name, $title, $description=null, $owner_id=null) {
+    if (!$parent->loaded || $parent->type != "album") {
+      throw new Exception("@todo INVALID_PARENT");
+    }
+
     $album = ORM::factory("item");
     $album->type = "album";
     $album->title = $title;
@@ -43,17 +47,12 @@ class album_Core {
     $album->resize_dirty = 1;
 
     while (ORM::factory("item")
-           ->where("parent_id", $parent_id)
+           ->where("parent_id", $parent->id)
            ->where("name", $album->name)
            ->find()->id) {
       $album->name = "{$name}-" . rand();
     }
 
-    $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());
     mkdir(dirname($album->thumb_path()));
diff --git a/core/helpers/photo.php b/core/helpers/photo.php
index 8c826e1c..d8fc2595 100644
--- a/core/helpers/photo.php
+++ b/core/helpers/photo.php
@@ -33,7 +33,11 @@ class photo_Core {
    * @param string  $description (optional) the longer description of this photo
    * @return Item_Model
    */
-  static function create($parent_id, $filename, $name, $title, $description=null, $owner_id=null) {
+  static function create($parent, $filename, $name, $title, $description=null, $owner_id=null) {
+    if (!$parent->loaded || $parent->type != "album") {
+      throw new Exception("@todo INVALID_PARENT");
+    }
+
     if (!is_file($filename)) {
       throw new Exception("@todo MISSING_IMAGE_FILE");
     }
@@ -63,7 +67,7 @@ class photo_Core {
 
     // Randomize the name if there's a conflict
     while (ORM::Factory("item")
-           ->where("parent_id", $parent_id)
+           ->where("parent_id", $parent->id)
            ->where("name", $photo->name)
            ->find()->id) {
       // @todo Improve this.  Random numbers are not user friendly
@@ -71,11 +75,6 @@ class photo_Core {
     }
 
     // This saves the photo
-    $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());
 
@@ -91,6 +90,8 @@ class photo_Core {
       $parent->save();
       graphics::generate($parent);
     }
+
+    return $photo;
   }
 
   static function get_add_form($parent) {