1 files changed, 10 insertions, 6 deletions

diff --git a/modules/server_add/controllers/server_add.php b/modules/server_add/controllers/server_add.php
index d93b63a3..4d6d5dfe 100644
--- a/modules/server_add/controllers/server_add.php
+++ b/modules/server_add/controllers/server_add.php
@@ -24,7 +24,7 @@ class Server_Add_Controller extends Admin_Controller {
       $files[] = $path;
     }
 
-    $item = ORM::factory("item", $id);
+    $item = ORM::factory("item")->where("id", "=", $id)->find();
     $view = new View("server_add_tree_dialog.html");
     $view->item = $item;
     $view->tree = new View("server_add_tree.html");
@@ -78,7 +78,7 @@ class Server_Add_Controller extends Admin_Controller {
    */
   public function start() {
     access::verify_csrf();
-    $item = ORM::factory("item", Input::instance()->get("item_id"));
+    $item = ORM::factory("item")->where("id", "=", Input::instance()->get("item_id"))->find();
 
     foreach (Input::instance()->post("paths") as $path) {
       if (server_add::is_valid_path($path)) {
@@ -104,7 +104,7 @@ class Server_Add_Controller extends Admin_Controller {
   function run($task_id) {
     access::verify_csrf();
 
-    $task = ORM::factory("task", $task_id);
+    $task = ORM::factory("task")->where("id", "=", $task_id)->find();
     if (!$task->loaded() || $task->owner_id != identity::active_user()->id) {
       access::forbidden();
     }
@@ -216,11 +216,12 @@ class Server_Add_Controller extends Admin_Controller {
 
         // Look up the parent item for this entry.  By now it should exist, but if none was
         // specified, then this belongs as a child of the current item.
-        $parent_entry = ORM::factory("server_add_file", $entry->parent_id);
+        $parent_entry =
+          ORM::factory("server_add_file")->where("id", "=", $entry->parent_id)->find();
         if (!$parent_entry->loaded()) {
-          $parent = ORM::factory("item", $task->get("item_id"));
+          $parent = ORM::factory("item")->where("id", "=", $task->get("item_id"))->find();
         } else {
-          $parent = ORM::factory("item", $parent_entry->item_id);
+          $parent = ORM::factory("item")->where("id", "=", $parent_entry->item_id)->find();
         }
 
         $name = basename($entry->file);
@@ -228,6 +229,7 @@ class Server_Add_Controller extends Admin_Controller {
         if (is_dir($entry->file)) {
           $album = ORM::factory("item");
           $album->type = "album";
+          $album->parent_id = $parent->id;
           $album->name = $name;
           $album->title = $title;
           $album->owner_id = $owner_id;
@@ -239,6 +241,7 @@ class Server_Add_Controller extends Admin_Controller {
             if (in_array($extension, array("gif", "png", "jpg", "jpeg"))) {
               $photo = ORM::factory("item");
               $photo->type = "photo";
+              $photo->parent_id = $parent->id;
               $photo->set_data_file($entry->file);
               $photo->name = $name;
               $photo->title = $title;
@@ -248,6 +251,7 @@ class Server_Add_Controller extends Admin_Controller {
             } else if (in_array($extension, array("flv", "mp4"))) {
               $movie = ORM::factory("item");
               $movie->type = "movie";
+              $movie->parent_id = $parent->id;
               $movie->set_data_file($entry->file);
               $movie->name = $name;
               $movie->title = $title;