tonyair/silverstripe-framework
1
0
Fork 0
mirror of https://github.com/silverstripe/silverstripe-framework synced 2024-06-30 00:19:25 +02:00
Code Issues Projects Releases Wiki Activity

FIX: Allow multi-line content in grid field cells

Browse Source 
It’s amazing that this but has been present for 7 years, but there you
go!
This commit is contained in:
Sam Minnee 2019-08-02 17:46:56 +12:00
parent 3224c9971b
commit 6ec02da577
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;