tonyair
/
silverstripe-userforms
mirror of https://github.com/silverstripe/silverstripe-userforms.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

BUGFIX: fix titles and labels being escaped multiple times resulting in html entities displaying in submission pages, export and emails. Fixes http://open.silverstripe.org/ticket/6787

This commit is contained in:
Will Rossiter 2011-12-05 23:19:20 +13:00
parent 2dac28ade9
commit 2ea28495f7
2 changed files with 3 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
code/UserDefinedForm.php
View File

@ -659,11 +659,10 @@ JS
if(!$field->showInReports()) continue;
// create a new submitted form field.
$submittedField = $field->getSubmittedFormField();
$submittedField->ParentID = $submittedForm->ID;
$submittedField->Name = $field->Name;
$submittedField->Title = $field->Title;
$submittedField->Title = $field->getField('Title');
// save the value from the data
if($field->hasMethod('getValueFromData')) {
@ -696,7 +695,7 @@ JS
}
if(!$this->DisableSaveSubmissions) $submittedField->write();
$submittedFields->push($submittedField);
}

2
code/submissions/SubmittedFormField.php
View File

@ -25,6 +25,6 @@ class SubmittedFormField extends DataObject {
* @return String
*/
function getFormattedValue() {
return nl2br($this->dbObject('Value')->RAW());
return nl2br($this->dbObject('Value')->ATT());
}
}