mirror of
https://github.com/silverstripe/silverstripe-framework
synced 2024-10-22 12:05:37 +00:00
BUG Allow custom getters in summaryFields() (fixes #7788)
Regression from ca1d38dffdb
This commit is contained in:
parent
82500dd4c4
commit
f070f971cf
@ -3135,7 +3135,6 @@ class DataObject extends ViewableData implements DataObjectInterface, i18nEntity
|
||||
* @return array
|
||||
*/
|
||||
public function summaryFields(){
|
||||
|
||||
$fields = $this->stat('summary_fields');
|
||||
|
||||
// if fields were passed in numeric array,
|
||||
@ -3158,8 +3157,9 @@ class DataObject extends ViewableData implements DataObjectInterface, i18nEntity
|
||||
if(!$fields) $fields['ID'] = 'ID';
|
||||
|
||||
// Localize fields (if possible)
|
||||
$labels = $this->fieldLabels(false);
|
||||
$fields = array_intersect_key($labels, $fields);
|
||||
foreach($this->fieldLabels(false) as $name => $label) {
|
||||
if(isset($fields[$name])) $fields[$name] = $label;
|
||||
}
|
||||
|
||||
return $fields;
|
||||
}
|
||||
|
Loading…
x
Reference in New Issue
Block a user