ENHANCEMENT: to make the FileIFrameField and TreeSelectionField easy to use in CMS with Translatable on. (from r103465)

git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@111665 467b73ca-7a2a-4603-9d3b-597d59a354a9
This commit is contained in:
Sam Minnee 2010-10-04 06:16:17 +00:00
parent a447f71a10
commit 81318288c5

View File

@ -291,9 +291,13 @@ JS;
} }
// Don't open a page from a different locale // Don't open a page from a different locale
if($record && Object::has_extension('SiteTree', 'Translatable') && $record->Locale && $record->Locale != Translatable::get_current_locale()) { /** The record's Locale is saved in database in 2.4, and not related with Session, we should check their locale matches the Translatable::get_current_locale,
* as long as we all the HTTPRequest is init with right locale.
* 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()) {
$record = null; $record = null;
} }*/
return $record; return $record;