tonyair/silverstripe-framework
1
0
Fork 0
mirror of https://github.com/silverstripe/silverstripe-framework synced 2024-10-22 12:05:37 +00:00
Code Issues Projects Releases Wiki Activity

BUG Allow custom getters in summaryFields() (fixes #7788)

Browse Source 
Regression from ca1d38dffdb
This commit is contained in:
Ingo Schommer 2012-08-29 13:42:29 +02:00
parent 82500dd4c4
commit f070f971cf
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
model/DataObject.php
View File

@ -3135,7 +3135,6 @@ class DataObject extends ViewableData implements DataObjectInterface, i18nEntity
* @return array * @return array
*/ */
public function summaryFields(){ public function summaryFields(){
$fields = $this->stat('summary_fields'); $fields = $this->stat('summary_fields');
// if fields were passed in numeric array, // if fields were passed in numeric array,
@ -3158,8 +3157,9 @@ class DataObject extends ViewableData implements DataObjectInterface, i18nEntity
if(!$fields) $fields['ID'] = 'ID'; if(!$fields) $fields['ID'] = 'ID';
// Localize fields (if possible) // Localize fields (if possible)
$labels = $this->fieldLabels(false); foreach($this->fieldLabels(false) as $name => $label) {
$fields = array_intersect_key($labels, $fields); if(isset($fields[$name])) $fields[$name] = $label;
}
return $fields; return $fields;
} }