mirror of
https://github.com/Pathduck/gallery3.git
synced 2026-05-21 03:49:21 -04:00
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
This commit is contained in:
@@ -51,7 +51,7 @@ class task_Core {
|
||||
|
||||
static function cancel($task_id) {
|
||||
$task = ORM::factory("task", $task_id);
|
||||
if (!$task->loaded) {
|
||||
if (!$task->loaded()) {
|
||||
throw new Exception("@todo MISSING_TASK");
|
||||
}
|
||||
$task->done = 1;
|
||||
@@ -65,14 +65,14 @@ class task_Core {
|
||||
|
||||
static function remove($task_id) {
|
||||
$task = ORM::factory("task", $task_id);
|
||||
if ($task->loaded) {
|
||||
if ($task->loaded()) {
|
||||
$task->delete();
|
||||
}
|
||||
}
|
||||
|
||||
static function run($task_id) {
|
||||
$task = ORM::factory("task", $task_id);
|
||||
if (!$task->loaded) {
|
||||
if (!$task->loaded()) {
|
||||
throw new Exception("@todo MISSING_TASK");
|
||||
}
|
||||
|
||||
@@ -84,7 +84,7 @@ class task_Core {
|
||||
}
|
||||
$task->save();
|
||||
} catch (Exception $e) {
|
||||
Kohana::log("error", $e->__toString());
|
||||
Kohana_Log::add("error", $e->__toString());
|
||||
$task->log($e->__toString());
|
||||
$task->state = "error";
|
||||
$task->done = true;
|
||||
|
||||
Reference in New Issue
Block a user