mirror of
https://github.com/silverstripe/silverstripe-framework
synced 2024-10-22 14:05:37 +02:00
BUGFIX #5099 FileIFrameField fails when using it with a locale different to the default
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/branches/2.4@100747 467b73ca-7a2a-4603-9d3b-597d59a354a9
This commit is contained in:
parent
55eda363f4
commit
2b69344d39
@ -63,6 +63,7 @@ class FileIFrameField extends FileField {
|
||||
}else{
|
||||
$iframe = "iframe";
|
||||
}
|
||||
|
||||
return $this->createTag (
|
||||
'iframe',
|
||||
array (
|
||||
@ -135,15 +136,22 @@ class FileIFrameField extends FileField {
|
||||
}
|
||||
|
||||
$fileSources["existing//$selectFile"] = new TreeDropdownField('ExistingFile', '', 'File');
|
||||
|
||||
$fields = new FieldSet (
|
||||
new HeaderField('EditFileHeader', $title),
|
||||
new SelectionGroup('FileSource', $fileSources)
|
||||
);
|
||||
|
||||
// locale needs to be passed through from the iframe source
|
||||
if(isset($_GET['locale'])) {
|
||||
$fields->push(new HiddenField('locale', '', $_GET['locale']));
|
||||
}
|
||||
|
||||
return new Form (
|
||||
$this,
|
||||
'EditFileForm',
|
||||
new FieldSet (
|
||||
new HeaderField('EditFileHeader', $title),
|
||||
new SelectionGroup('FileSource', $fileSources)
|
||||
),
|
||||
new FieldSet (
|
||||
$fields,
|
||||
new FieldSet(
|
||||
new FormAction('save', $title)
|
||||
)
|
||||
);
|
||||
|
Loading…
Reference in New Issue
Block a user