From b31188f2525b833753f19a81e9b59f25e29b90f1 Mon Sep 17 00:00:00 2001 From: Andrew O'Neil Date: Wed, 10 Oct 2012 10:59:52 +1300 Subject: [PATCH] APICHANGE: Use late static binding for Object::has_extension() --- code/controllers/CMSMain.php | 4 ++-- code/controllers/ContentController.php | 2 +- code/controllers/RootURLController.php | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/code/controllers/CMSMain.php b/code/controllers/CMSMain.php index c3477a90..bf6904ff 100644 --- a/code/controllers/CMSMain.php +++ b/code/controllers/CMSMain.php @@ -50,7 +50,7 @@ class CMSMain extends LeftAndMain implements CurrentPageIdentifier, PermissionPr public function init() { // set reading lang - if(Object::has_extension('SiteTree', 'Translatable') && !$this->request->isAjax()) { + if(SiteTree::has_extension('Translatable') && !$this->request->isAjax()) { Translatable::choose_site_locale(array_keys(Translatable::get_existing_content_languages('SiteTree'))); } @@ -566,7 +566,7 @@ class CMSMain extends LeftAndMain implements CurrentPageIdentifier, PermissionPr * This bit breaks the all FileIFrameField functions if the field is used in CMS * and its relevent ajax calles, like loading the tree dropdown for TreeSelectorField. */ - /* if($record && Object::has_extension('SiteTree', 'Translatable') && $record->Locale && $record->Locale != Translatable::get_current_locale()) { + /* if($record && SiteTree::has_extension('Translatable') && $record->Locale && $record->Locale != Translatable::get_current_locale()) { $record = null; }*/ diff --git a/code/controllers/ContentController.php b/code/controllers/ContentController.php index 4593d302..c7756dd4 100644 --- a/code/controllers/ContentController.php +++ b/code/controllers/ContentController.php @@ -366,7 +366,7 @@ HTML; public function ContentLocale() { if($this->dataRecord && $this->dataRecord->hasExtension('Translatable')) { $locale = $this->dataRecord->Locale; - } elseif(class_exists('Translatable') && Object::has_extension('SiteTree', 'Translatable')) { + } elseif(class_exists('Translatable') && SiteTree::has_extension('Translatable')) { $locale = Translatable::get_current_locale(); } else { $locale = i18n::get_locale(); diff --git a/code/controllers/RootURLController.php b/code/controllers/RootURLController.php index fada980d..f59d3559 100644 --- a/code/controllers/RootURLController.php +++ b/code/controllers/RootURLController.php @@ -44,7 +44,7 @@ class RootURLController extends Controller { // TODO Move to 'translatable' module if ( class_exists('Translatable') - && Object::has_extension('SiteTree', 'Translatable') + && SiteTree::has_extension('Translatable') && $link = Translatable::get_homepage_link_by_locale(Translatable::get_current_locale()) ) { self::$cached_homepage_link = $link;