tonyair
/
silverstripe-framework
mirror of https://github.com/silverstripe/silverstripe-framework
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

BUG Fix DataObject::dbObject assigning incorrect table to DBField instance

This commit is contained in:
Damian Mooyman 2016-11-13 20:58:22 +13:00
parent cac326eebb
commit 00c9c2c775
1 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/ORM/DataObject.php
View File

@ -2590,7 +2590,8 @@ class DataObject extends ViewableData implements DataObjectInterface, i18nEntity
*/
public function dbObject($fieldName) {
// Check for field in DB
$helper = static::getSchema()->fieldSpec(static::class, $fieldName, DataObjectSchema::INCLUDE_CLASS);
$schema = static::getSchema();
$helper = $schema->fieldSpec(static::class, $fieldName, DataObjectSchema::INCLUDE_CLASS);
if(!$helper) {
return null;
}
@ -2604,8 +2605,9 @@ class DataObject extends ViewableData implements DataObjectInterface, i18nEntity
return $value;
}
list($table, $spec) = explode('.', $helper);
list($class, $spec) = explode('.', $helper);
/** @var DBField $obj */
$table = $schema->tableName($class);
$obj = Object::create_from_string($spec, $fieldName);
$obj->setTable($table);
$obj->setValue($value, $this, false);