tonyair/silverstripe-framework
1
0
Fork 0
mirror of https://github.com/silverstripe/silverstripe-framework synced 2024-09-29 20:59:23 +02:00
Code Issues Projects Releases Wiki Activity

Merge pull request #917 from TheFrozenFire/feature-DataObjectFromStdClass

Browse Source 
API: DataObject::__construct() now accepts stdClass for $record
This commit is contained in:
Simon Welsh 2012-11-03 02:16:07 -07:00
commit d8c920285c
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
model/DataObject.php
View File

@ -323,7 +323,7 @@ class DataObject extends ViewableData implements DataObjectInterface, i18nEntity
); );
} }
if(!is_array($record)) { if(!is_array($record) && !is_a($record, "stdClass")) {
if(is_object($record)) $passed = "an object of type '$record->class'"; if(is_object($record)) $passed = "an object of type '$record->class'";
else $passed = "The value '$record'"; else $passed = "The value '$record'";