tonyair/silverstripe-framework
1
0
Fork 0
mirror of https://github.com/silverstripe/silverstripe-framework synced 2024-10-04 15:18:39 +02:00
Code Issues Projects Releases Wiki Activity

Merge pull request #5569 from silverstripe-terraformers/fixes/field-diff

Browse Source 
Switched Diff to the escaped variable created
This commit is contained in:
Daniel Hensby 2016-05-20 01:26:41 +01:00
commit 4c4154115f
1 changed files with 1 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
model/DataDifferencer.php
View File

@ -213,9 +213,7 @@ class DataDifferencer extends ViewableData {
$changedFields->push(new ArrayData(array( $changedFields->push(new ArrayData(array(
'Name' => $field, 'Name' => $field,
'Title' => $base->fieldLabel($field), 'Title' => $base->fieldLabel($field),
'Diff' => $this->fromRecord 'Diff' => $fieldDiff,
? Diff::compareHTML($this->fromRecord->$field, $this->toRecord->$field)
: "<ins>" . $this->toRecord->$field . "</ins>",
'From' => $this->fromRecord ? $this->fromRecord->$field : null, 'From' => $this->fromRecord ? $this->fromRecord->$field : null,
'To' => $this->toRecord ? $this->toRecord->$field : null, 'To' => $this->toRecord ? $this->toRecord->$field : null,
))); )));