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

Conflicts:
	modules/gallery/models/item.php

1 files changed, 4 insertions, 12 deletions

diff --git a/modules/gallery/models/item.php b/modules/gallery/models/item.php
index 481b22bc..1ce4d340 100644
--- a/modules/gallery/models/item.php
+++ b/modules/gallery/models/item.php
@@ -352,19 +352,11 @@ class Item_Model extends ORM_MPTT {
       if (!$this->loaded) {
         try {
         $this->created = $this->updated;
-        Kohana::log("error", "get Weight");
-        $weight = ORM::factory("item")
-          ->select("weight")
-          ->orderby("weight", "DESC")
-          ->limit(1)
-          ->find_all()
-          ->current()->weight;
-          Kohana::log("error", "Weight: $weight");
+        $weight = Database::instance()
+          ->select("weight")->from("items")
+          ->orderby("weight", "desc")->limit(1)
+          ->get()->current()->weight;
         $this->weight = $weight + 1;
-        } catch (Exception $e) {
-          Kohana::log("error", $e->__toString());
-          throw $e;
-        }
       } else {
         $send_event = 1;
       }