From 84a591bf2b22b5acaee83e29de98ff86c4883cf2 Mon Sep 17 00:00:00 2001 From: Sean Harvey Date: Thu, 26 Nov 2009 22:38:04 +0000 Subject: [PATCH] BUGFIX Removed calls to Translatable::is_enabled() since it's deprecated, replaced with Object::has_extension('SiteTree', 'Translatable') instead git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/branches/2.4@93676 467b73ca-7a2a-4603-9d3b-597d59a354a9 --- code/CMSMain.php | 2 +- code/LeftAndMain.php | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/code/CMSMain.php b/code/CMSMain.php index 0aa78bf7..7f9b78da 100755 --- a/code/CMSMain.php +++ b/code/CMSMain.php @@ -384,7 +384,7 @@ JS; } // Don't open a page from a different locale - if($record && Translatable::is_enabled() && $record->Locale && $record->Locale != Translatable::get_current_locale()) { + if($record && Object::has_extension('SiteTree', 'Translatable') && $record->Locale && $record->Locale != Translatable::get_current_locale()) { $record = null; } diff --git a/code/LeftAndMain.php b/code/LeftAndMain.php index 2edd4724..56d210f6 100644 --- a/code/LeftAndMain.php +++ b/code/LeftAndMain.php @@ -112,7 +112,7 @@ class LeftAndMain extends Controller { ); // set reading lang - if(Translatable::is_enabled() && !Director::is_ajax()) { + if(Object::has_extension('SiteTree', 'Translatable') && !Director::is_ajax()) { Translatable::choose_site_locale(array_keys(Translatable::get_existing_content_languages('SiteTree'))); }