mirror of
https://github.com/Pathduck/gallery3.git
synced 2026-05-31 16:59:22 -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:
@@ -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();
|
||||
}
|
||||
|
||||
|
||||
Reference in New Issue
Block a user