From 2e420522ece22942a9b3b6ee413ca0e1dfa76148 Mon Sep 17 00:00:00 2001
From: Bharat Mediratta <bharat@menalto.com>
Date: Wed, 25 Nov 2009 13:22:24 -0800
Subject: 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

---
 modules/gallery/models/item.php | 6 +++---
 modules/gallery/models/log.php  | 2 +-
 2 files changed, 4 insertions(+), 4 deletions(-)

(limited to 'modules/gallery/models')

diff --git a/modules/gallery/models/item.php b/modules/gallery/models/item.php
index d27e331b..bd1f9af5 100644
--- a/modules/gallery/models/item.php
+++ b/modules/gallery/models/item.php
@@ -309,7 +309,7 @@ class Item_Model extends ORM_MPTT {
    * @return string
    */
   public function relative_path() {
-    if (!$this->loaded) {
+    if (!$this->loaded()) {
       return;
     }
 
@@ -324,7 +324,7 @@ class Item_Model extends ORM_MPTT {
    * @return string
    */
   public function relative_url() {
-    if (!$this->loaded) {
+    if (!$this->loaded()) {
       return;
     }
 
@@ -383,7 +383,7 @@ class Item_Model extends ORM_MPTT {
 
     if (!empty($this->changed) && $significant_changes) {
       $this->updated = time();
-      if (!$this->loaded) {
+      if (!$this->loaded()) {
         $this->created = $this->updated;
         $this->weight = item::get_max_weight();
       } else {
diff --git a/modules/gallery/models/log.php b/modules/gallery/models/log.php
index c816a4a7..a2044325 100644
--- a/modules/gallery/models/log.php
+++ b/modules/gallery/models/log.php
@@ -28,7 +28,7 @@ class Log_Model extends ORM {
       try {
         return identity::lookup_user($this->user_id);
       } catch (Exception $e) {
-        Kohana::log("alert", "Unable to load user with id $this->user_id");
+        Kohana_Log::add("alert", "Unable to load user with id $this->user_id");
         return null;
       }
     } else {
-- 
cgit v1.2.3