From cc31e106727e961dd9e01cfe1755fa7a7853525a Mon Sep 17 00:00:00 2001 From: Ingo Schommer Date: Thu, 14 May 2009 06:07:32 +0000 Subject: [PATCH] MINOR Merged from trunk git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/branches/2.3@76856 467b73ca-7a2a-4603-9d3b-597d59a354a9 --- code/CMSMain.php | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/code/CMSMain.php b/code/CMSMain.php index 510b4613..925c373d 100644 --- a/code/CMSMain.php +++ b/code/CMSMain.php @@ -376,7 +376,7 @@ JS; } // Don't open a page from a different locale - if($record && Translatable::is_enabled() && $record->Locale && $record->Locale != Translatable::current_locale()) { + if($record && Translatable::is_enabled() && $record->Locale && $record->Locale != Translatable::get_current_locale()) { $record = null; } @@ -981,7 +981,7 @@ JS; $fields = new FieldSet( new HiddenField("ParentID"), - new HiddenField("Locale", 'Locale', Translatable::current_locale()), + new HiddenField("Locale", 'Locale', Translatable::get_current_locale()), new DropdownField("PageType", "", $pageTypes, 'Page') ); @@ -1190,7 +1190,7 @@ JS; } //user doesn't have permission to switch langs so just show a string displaying current language - return i18n::get_locale_name( Translatable::current_locale() ); + return i18n::get_locale_name( Translatable::get_current_locale() ); } /**