mirror of
https://github.com/Pathduck/gallery3.git
synced 2026-08-31 03:15:46 -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:
@@ -110,7 +110,7 @@ class Admin_Comments_Controller extends Admin_Controller {
|
||||
|
||||
$comment = ORM::factory("comment", $id);
|
||||
$orig = clone $comment;
|
||||
if ($comment->loaded) {
|
||||
if ($comment->loaded()) {
|
||||
$comment->state = $state;
|
||||
$comment->save();
|
||||
}
|
||||
|
||||
@@ -59,7 +59,7 @@ class Comment_Model extends ORM {
|
||||
public function save() {
|
||||
if (!empty($this->changed)) {
|
||||
$this->updated = time();
|
||||
if (!$this->loaded && empty($this->created)) {
|
||||
if (!$this->loaded() && empty($this->created)) {
|
||||
$this->created = $this->updated;
|
||||
$created = true;
|
||||
}
|
||||
|
||||
@@ -27,6 +27,6 @@ class Comment_Event_Test extends Unit_Test_Case {
|
||||
$album->delete();
|
||||
|
||||
$deleted_comment = ORM::factory("comment", $comment->id);
|
||||
$this->assert_false($deleted_comment->loaded);
|
||||
$this->assert_false($deleted_comment->loaded());
|
||||
}
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user