mirror of
https://github.com/Pathduck/gallery3.git
synced 2026-07-28 10:43:53 -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:
@@ -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 {
|
||||
|
||||
Reference in New Issue
Block a user