summaryrefslogtreecommitdiff
path: root/modules/g2_import/controllers/g2.php
diff options
context:
space:
mode:
authorNathan Kinkade <nkinkade@nkinka.de>2010-02-02 02:59:20 +0000
committerNathan Kinkade <nkinkade@nkinka.de>2010-02-02 02:59:20 +0000
commit9d0927dda936756f1f5003813f437d714fe481f8 (patch)
treefe1b887345b37387ab0ddcfd78bf344f6150b6cc /modules/g2_import/controllers/g2.php
parenta6f794c20dc3592bcaef17c622413c1b670a20d8 (diff)
parent43985ea2fb137aa7d532617271e37d7c20def3c5 (diff)
Merge branch 'master' of git://github.com/gallery/gallery3
Diffstat (limited to 'modules/g2_import/controllers/g2.php')
-rw-r--r--modules/g2_import/controllers/g2.php2
1 files changed, 1 insertions, 1 deletions
diff --git a/modules/g2_import/controllers/g2.php b/modules/g2_import/controllers/g2.php
index 3e002758..5fd4400c 100644
--- a/modules/g2_import/controllers/g2.php
+++ b/modules/g2_import/controllers/g2.php
@@ -50,7 +50,7 @@ class G2_Controller extends Admin_Controller {
throw new Kohana_404_Exception();
}
- $item = ORM::factory("item")->where("id", "=", $g2_map->g3_id)->find();
+ $item = ORM::factory("item", $g2_map->g3_id);
if (!$item->loaded() || !access::can("view", $item)) {
throw new Kohana_404_Exception();
}