mirror of
https://github.com/silverstripe/silverstripe-framework
synced 2024-10-22 14:05:37 +02:00
Merge branch '4.11' into 4
This commit is contained in:
commit
db5fbcd035
@ -242,7 +242,7 @@ class GridFieldExportButton extends AbstractGridFieldComponent implements GridFi
|
|||||||
}
|
}
|
||||||
|
|
||||||
$value = $columnHeader($relObj);
|
$value = $columnHeader($relObj);
|
||||||
} elseif ($gridFieldColumnsComponent && array_key_exists($columnSource, $columnsHandled ?? [])) {
|
} elseif ($gridFieldColumnsComponent && in_array($columnSource, $columnsHandled ?? [])) {
|
||||||
$value = strip_tags(
|
$value = strip_tags(
|
||||||
$gridFieldColumnsComponent->getColumnContent($gridField, $item, $columnSource) ?? ''
|
$gridFieldColumnsComponent->getColumnContent($gridField, $item, $columnSource) ?? ''
|
||||||
);
|
);
|
||||||
|
Loading…
Reference in New Issue
Block a user