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

1 files changed, 5 insertions, 5 deletions

diff --git a/modules/gallery/helpers/MY_url.php b/modules/gallery/helpers/MY_url.php
index 139aec21..74284951 100644
--- a/modules/gallery/helpers/MY_url.php
+++ b/modules/gallery/helpers/MY_url.php
@@ -32,7 +32,7 @@ class url extends url_Core {
     }
 
     $item = self::get_item_from_uri(Router::$current_uri);
-    if ($item && $item->loaded) {
+    if ($item && $item->loaded()) {
       Router::$controller = "{$item->type}s";
       Router::$controller_path = MODPATH . "gallery/controllers/{$item->type}s.php";
       Router::$method = "show";
@@ -51,12 +51,12 @@ class url extends url_Core {
     // In most cases, we'll have an exact match in the relative_url_cache item field.
     // but failing that, walk down the tree until we find it.  The fallback code will fix caches
     // as it goes, so it'll never be run frequently.
-    $item = ORM::factory("item")->where("relative_url_cache", $current_uri)->find();
-    if (!$item->loaded) {
+    $item = ORM::factory("item")->where("relative_url_cache", "=", $current_uri)->find();
+    if (!$item->loaded()) {
       $count = count(Router::$segments);
       foreach (ORM::factory("item")
-               ->where("slug", html_entity_decode(Router::$segments[$count - 1], ENT_QUOTES))
-               ->where("level", $count + 1)
+               ->where("slug", "=", html_entity_decode(Router::$segments[$count - 1], ENT_QUOTES))
+               ->where("level", "=", $count + 1)
                ->find_all() as $match) {
         if ($match->relative_url() == $current_uri) {
           $item = $match;