tonyair/silverstripe-framework
1
0
Fork 0
mirror of https://github.com/silverstripe/silverstripe-framework synced 2024-07-03 09:59:32 +02:00
Code Issues Projects Releases Wiki Activity

BUGFIX #5099 FileIFrameField fails when using it with a locale different to the default (from r100747)

Browse Source 
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@105634 467b73ca-7a2a-4603-9d3b-597d59a354a9
This commit is contained in:
Ingo Schommer 2010-05-25 04:26:47 +00:00
parent 132a5ebaab
commit c8ac8a274d
1 changed files with 13 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
forms/FileIFrameField.php
View File

@ -63,6 +63,7 @@ class FileIFrameField extends FileField {
}else{ }else{
$iframe = "iframe"; $iframe = "iframe";
} }
return $this->createTag ( return $this->createTag (
'iframe', 'iframe',
array ( array (
@ -136,13 +137,20 @@ class FileIFrameField extends FileField {
$fileSources["existing//$selectFile"] = new TreeDropdownField('ExistingFile', '', 'File'); $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 ( return new Form (
$this, $this,
'EditFileForm', 'EditFileForm',
new FieldSet ( $fields,
new HeaderField('EditFileHeader', $title),
new SelectionGroup('FileSource', $fileSources)
),
new FieldSet( new FieldSet(
new FormAction('save', $title) new FormAction('save', $title)
) )