tonyair/silverstripe-framework
1
0
Fork 0
mirror of https://github.com/silverstripe/silverstripe-framework synced 2024-10-04 15:18:39 +02:00
Code Issues Projects Releases Wiki Activity

#1444 - DataObjectDecorator? Merge Fields HUGE PROBLEM (merged from 2.1.0 branch, r42210)

Browse Source 
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@42918 467b73ca-7a2a-4603-9d3b-597d59a354a9
This commit is contained in:
Andrew O'Neil 2007-10-02 04:48:37 +00:00
parent 5062c955e0
commit 30efb8efc7
1 changed files with 1 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
core/model/DataObjectDecorator.php
View File

@ -22,10 +22,7 @@ abstract class DataObjectDecorator extends Extension {
if($fields) {
foreach($fields as $relationType => $fields) {
if(in_array($relationType, array('db', 'has_one', 'indexes',
'defaults', 'many_many',
'belongs_many_many',
'many_many_extraFields'))) {
if(in_array($relationType, array('db', 'has_one', 'indexes', 'defaults', 'has_many', 'many_many', 'belongs_many_many', 'many_many_extraFields'))) {
eval("$className::\$$relationType = array_merge((array){$className}::\$$relationType, (array)\$fields);");
}
}