From f070f971cfd001743b0229085094e0d18a147482 Mon Sep 17 00:00:00 2001 From: Ingo Schommer Date: Wed, 29 Aug 2012 13:42:29 +0200 Subject: [PATCH] BUG Allow custom getters in summaryFields() (fixes #7788) Regression from ca1d38dffdb --- model/DataObject.php | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/model/DataObject.php b/model/DataObject.php index d7f5db288..e624a794d 100644 --- a/model/DataObject.php +++ b/model/DataObject.php @@ -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; }