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

7 files changed, 16 insertions, 15 deletions

diff --git a/modules/gallery/controllers/admin_maintenance.php b/modules/gallery/controllers/admin_maintenance.php
index 66bcce55..fe5059e7 100644
--- a/modules/gallery/controllers/admin_maintenance.php
+++ b/modules/gallery/controllers/admin_maintenance.php
@@ -75,7 +75,7 @@ class Admin_Maintenance_Controller extends Admin_Controller {
     access::verify_csrf();
 
     $task = ORM::factory("task", $task_id);
-    if (!$task->loaded) {
+    if (!$task->loaded()) {
       throw new Exception("@todo MISSING_TASK");
     }
     $view = new View("admin_maintenance_task.html");
@@ -97,7 +97,7 @@ class Admin_Maintenance_Controller extends Admin_Controller {
     access::verify_csrf();
 
     $task = ORM::factory("task", $task_id);
-    if (!$task->loaded) {
+    if (!$task->loaded()) {
       throw new Exception("@todo MISSING_TASK");
     }
     $view = new View("admin_maintenance_show_log.html");
@@ -114,7 +114,7 @@ class Admin_Maintenance_Controller extends Admin_Controller {
     access::verify_csrf();
 
     $task = ORM::factory("task", $task_id);
-    if (!$task->loaded) {
+    if (!$task->loaded()) {
       throw new Exception("@todo MISSING_TASK");
     }
 
@@ -184,7 +184,7 @@ class Admin_Maintenance_Controller extends Admin_Controller {
     try {
       $task = task::run($task_id);
     } catch (Exception $e) {
-      Kohana::log(
+      Kohana_Log::add(
         "error",
         sprintf(
           "%s in %s at line %s:\n%s", $e->getMessage(), $e->getFile(),
diff --git a/modules/gallery/controllers/albums.php b/modules/gallery/controllers/albums.php
index e67df6f6..cc63d43f 100644
--- a/modules/gallery/controllers/albums.php
+++ b/modules/gallery/controllers/albums.php
@@ -66,6 +66,7 @@ class Albums_Controller extends Items_Controller {
 
     $template = new Theme_View("page.html", "collection", "album");
     $template->set_global("page", $page);
+    $template->set_global("page_title", null);
     $template->set_global("max_pages", $max_pages);
     $template->set_global("page_size", $page_size);
     $template->set_global("item", $album);
@@ -76,7 +77,7 @@ class Albums_Controller extends Items_Controller {
 
     // We can't use math in ORM or the query builder, so do this by hand.  It's important
     // that we do this with math, otherwise concurrent accesses will damage accuracy.
-    Database::instance()->query(
+    db::query(
       "UPDATE {items} SET `view_count` = `view_count` + 1 WHERE `id` = $album->id");
 
     print $template;
diff --git a/modules/gallery/controllers/file_proxy.php b/modules/gallery/controllers/file_proxy.php
index acfd6eb9..11d858c0 100644
--- a/modules/gallery/controllers/file_proxy.php
+++ b/modules/gallery/controllers/file_proxy.php
@@ -58,7 +58,7 @@ class File_Proxy_Controller extends Controller {
 
     // We now have the relative path to the item.  Search for it in the path cache
     $item = ORM::factory("item")->where("relative_path_cache", $path)->find();
-    if (!$item->loaded) {
+    if (!$item->loaded()) {
       // We didn't turn it up.  It's possible that the relative_path_cache is out of date here.
       // There was fallback code, but bharat deleted it in 8f1bca74.  If it turns out to be
       // necessary, it's easily resurrected.
@@ -70,14 +70,14 @@ class File_Proxy_Controller extends Controller {
         foreach (array("flv", "mp4") as $ext) {
           $movie_path = preg_replace('/.jpg$/', ".$ext", $path);
           $item = ORM::factory("item")->where("relative_path_cache", $movie_path)->find();
-          if ($item->loaded) {
+          if ($item->loaded()) {
             break;
           }
         }
       }
     }
 
-    if (!$item->loaded) {
+    if (!$item->loaded()) {
       kohana::show_404();
     }
 
diff --git a/modules/gallery/controllers/l10n_client.php b/modules/gallery/controllers/l10n_client.php
index 3801e6aa..2eda741c 100644
--- a/modules/gallery/controllers/l10n_client.php
+++ b/modules/gallery/controllers/l10n_client.php
@@ -33,7 +33,7 @@ class L10n_Client_Controller extends Controller {
                       "locale" => "root"))
         ->find();
 
-    if (!$root_message->loaded) {
+    if (!$root_message->loaded()) {
       throw new Exception("@todo bad request data / illegal state");
     }
     $is_plural = Gallery_I18n::is_plural_message(unserialize($root_message->message));
@@ -60,7 +60,7 @@ class L10n_Client_Controller extends Controller {
                     "locale" => $locale))
       ->find();
 
-    if (!$entry->loaded) {
+    if (!$entry->loaded()) {
       $entry->key = $key;
       $entry->locale = $locale;
       $entry->message = $root_message->message;
@@ -74,7 +74,7 @@ class L10n_Client_Controller extends Controller {
                     "locale" => $locale))
       ->find();
 
-    if (!$entry_from_incoming->loaded) {
+    if (!$entry_from_incoming->loaded()) {
       $entry->base_revision = $entry_from_incoming->revision;
     }
 
diff --git a/modules/gallery/controllers/permissions.php b/modules/gallery/controllers/permissions.php
index 99943fbb..e03f41a9 100644
--- a/modules/gallery/controllers/permissions.php
+++ b/modules/gallery/controllers/permissions.php
@@ -57,7 +57,7 @@ class Permissions_Controller extends Controller {
     access::required("view", $item);
     access::required("edit", $item);
 
-    if (!empty($group) && $perm->loaded && $item->loaded) {
+    if (!empty($group) && $perm->loaded() && $item->loaded()) {
       switch($command) {
       case "allow":
         access::allow($group, $perm->name, $item);
diff --git a/modules/gallery/controllers/rest.php b/modules/gallery/controllers/rest.php
index 2edf079f..087f2c29 100644
--- a/modules/gallery/controllers/rest.php
+++ b/modules/gallery/controllers/rest.php
@@ -82,7 +82,7 @@ class REST_Controller extends Controller {
     }
 
     $resource = ORM::factory($this->resource_type, (int)$function);
-    if (!$resource->loaded && $request_method != "post") {
+    if (!$resource->loaded() && $request_method != "post") {
       return Kohana::show_404();
     }
 
@@ -111,7 +111,7 @@ class REST_Controller extends Controller {
     }
 
     $resource = ORM::factory($this->resource_type, $resource_id);
-    if (!$resource->loaded) {
+    if (!$resource->loaded()) {
       return Kohana::show_404();
     }
 
diff --git a/modules/gallery/controllers/simple_uploader.php b/modules/gallery/controllers/simple_uploader.php
index 37753ff3..5d32e35f 100644
--- a/modules/gallery/controllers/simple_uploader.php
+++ b/modules/gallery/controllers/simple_uploader.php
@@ -72,7 +72,7 @@ class Simple_Uploader_Controller extends Controller {
           module::event("add_photos_form_completed", $item, $form);
         }
       } catch (Exception $e) {
-        Kohana::log("alert", $e->__toString());
+        Kohana_Log::add("alert", $e->__toString());
         if (file_exists($temp_filename)) {
           unlink($temp_filename);
         }