tonyair/silverstripe-cms
1
0
Fork 0
mirror of https://github.com/silverstripe/silverstripe-cms synced 2024-10-22 06:05:56 +00:00
Code Issues Projects Releases Wiki Activity

MINOR Merged from trunk

Browse Source 
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/branches/2.3@76856 467b73ca-7a2a-4603-9d3b-597d59a354a9
This commit is contained in:
Ingo Schommer 2009-05-14 06:07:32 +00:00 committed by Sam Minnee
parent f80bd441b7
commit cc31e10672
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
code/CMSMain.php
View File

@ -376,7 +376,7 @@ JS;
} }
// Don't open a page from a different locale // 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; $record = null;
} }
@ -981,7 +981,7 @@ JS;
$fields = new FieldSet( $fields = new FieldSet(
new HiddenField("ParentID"), new HiddenField("ParentID"),
new HiddenField("Locale", 'Locale', Translatable::current_locale()), new HiddenField("Locale", 'Locale', Translatable::get_current_locale()),
new DropdownField("PageType", "", $pageTypes, 'Page') 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 //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() );
} }
/** /**