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

FIX 7590: Image thumbnails broken in gridfield

Browse Source 
Delay converting the object to a string and escaping its value until the end of getColumnContent. Call formatValue BEFORE castValue, so that formatValue can create raw HTML by casting to HTMLText afterwards.
This commit is contained in:
jakr 2012-07-26 09:18:22 +02:00 committed by Hamish Friedlander
parent 5591017577
commit 15e2efb55d
1 changed files with 7 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
forms/gridfield/GridFieldDataColumns.php
View File

@ -94,7 +94,7 @@ class GridFieldDataColumns implements GridField_ColumnProvider {
* Caution: Make sure to escape special php-characters like in a normal php-statement. * Caution: Make sure to escape special php-characters like in a normal php-statement.
* Example: "myFieldName" => '<a href=\"custom-admin/$ID\">$ID</a>'. * Example: "myFieldName" => '<a href=\"custom-admin/$ID\">$ID</a>'.
* Alternatively, pass a anonymous function, which takes two parameters: * Alternatively, pass a anonymous function, which takes two parameters:
* The value returned by Convert::raw2xml and the original list item. * The value and the original list item.
* *
* @param array $formatting * @param array $formatting
*/ */
@ -126,18 +126,20 @@ class GridFieldDataColumns implements GridField_ColumnProvider {
// Allow callbacks // Allow callbacks
if(is_array($columnInfo) && isset($columnInfo['callback'])) { if(is_array($columnInfo) && isset($columnInfo['callback'])) {
$method = $columnInfo['callback']; $method = $columnInfo['callback'];
$value = Convert::raw2xml($method($record)); $value = $method($record);
// This supports simple FieldName syntax // This supports simple FieldName syntax
} else { } else {
$value = Convert::raw2xml($gridField->getDataFieldValue($record, $columnName)); $value = $gridField->getDataFieldValue($record, $columnName);
} }
$value = $this->castValue($gridField, $columnName, $value);
$value = $this->formatValue($gridField, $record, $columnName, $value); $value = $this->formatValue($gridField, $record, $columnName, $value);
$value = $this->castValue($gridField, $columnName, $value);
$value = $this->escapeValue($gridField, $value); $value = $this->escapeValue($gridField, $value);
return $value; return (is_object($value) && $value instanceof Object && $value->hasMethod('forTemplate'))
? $value->forTemplate()
: Convert::raw2xml($value);
} }
/** /**