Preliminary work to cut over to Kohana 2.4

- Kohana::log() -> Kohana_Log::add()
- Kohana::config_XXX -> Kohana_Config::instance()->XXX
- Implement View::set_global in MY_View
- Updated Cache_Database_Driver to latest APIs
- ORM::$loaded -> ORM::loaded()
- Updated item::viewable() to use K2.4 parenthesization

1 files changed, 2 insertions, 2 deletions

diff --git a/modules/gallery/helpers/MY_url.php b/modules/gallery/helpers/MY_url.php
index 368c947e..e5eefad7 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 = $item->id;
@@ -51,7 +51,7 @@ class url extends url_Core {
     // 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) {
+    if (!$item->loaded()) {
       $count = count(Router::$segments);
       foreach (ORM::factory("item")
                ->where("slug", html_entity_decode(Router::$segments[$count - 1], ENT_QUOTES))