tonyair/silverstripe-framework
1
0
Fork 0
mirror of https://github.com/silverstripe/silverstripe-framework synced 2024-10-22 14:05:37 +02:00
Code Issues Projects Releases Wiki Activity

Merge pull request #9165 from sminnee/fix-multiline-gridfield

Browse Source 
FIX: Allow multi-line content in grid field cells
This commit is contained in:
Robbie Averill 2019-08-05 09:59:22 +12:00 committed by GitHub
commit 4268db069d
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/Forms/GridField/GridFieldDataColumns.php
View File

@ -253,14 +253,14 @@ class GridFieldDataColumns implements GridField_ColumnProvider
// If the value is an object, we do one of two things // If the value is an object, we do one of two things
if (method_exists($value, 'Nice')) { if (method_exists($value, 'Nice')) {
// If it has a "Nice" method, call that & make sure the result is safe // If it has a "Nice" method, call that & make sure the result is safe
$value = Convert::raw2xml($value->Nice()); $value = nl2br(Convert::raw2xml($value->Nice()));
} else { } else {
// Otherwise call forTemplate - the result of this should already be safe // Otherwise call forTemplate - the result of this should already be safe
$value = $value->forTemplate(); $value = $value->forTemplate();
} }
} else { } else {
// Otherwise, just treat as a text string & make sure the result is safe // Otherwise, just treat as a text string & make sure the result is safe
$value = Convert::raw2xml($value); $value = nl2br(Convert::raw2xml($value));
} }
return $value; return $value;