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

MINOR Ignore any values that come through as arrays in DataObject::cache_composite_fields()

Browse Source
This commit is contained in:
Sean Harvey 2012-04-20 15:24:17 +12:00
parent 58599dc9d1
commit 1683299d81
1 changed files with 2 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
model/DataObject.php
View File

@ -271,6 +271,8 @@ class DataObject extends ViewableData implements DataObjectInterface, i18nEntity
$fields = Config::inst()->get($class, 'db', Config::UNINHERITED); $fields = Config::inst()->get($class, 'db', Config::UNINHERITED);
if($fields) foreach($fields as $fieldName => $fieldClass) { if($fields) foreach($fields as $fieldName => $fieldClass) {
if(!is_string($fieldClass)) continue;
// Strip off any parameters // Strip off any parameters
$bPos = strpos('(', $fieldClass); $bPos = strpos('(', $fieldClass);
if($bPos !== FALSE) $fieldClass = substr(0,$bPos, $fieldClass); if($bPos !== FALSE) $fieldClass = substr(0,$bPos, $fieldClass);