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

DataObject decorator bug fixing - addStaticVars() function. 

git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@39284 467b73ca-7a2a-4603-9d3b-597d59a354a9
This commit is contained in:
Kirti Nanji 2007-07-26 21:57:01 +00:00
parent 4160579f97
commit 94fc673f97
1 changed files with 3 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
core/Object.php
View File

@ -243,14 +243,12 @@ class Object {
if (empty(Object::$extraStatics[$class])) { if (empty(Object::$extraStatics[$class])) {
Object::$extraStatics[$class] = (array)$statics; Object::$extraStatics[$class] = (array)$statics;
} else { } else {
Object::$extraStatics[$class] = array_merge( $ar1 = (array)Object::$extraStatics[$class]; // First Array To Merge
(array)Object::$extraStatics[$class], $ar2 = (array)$statics; // Second Array To Merge
(array)$statics Object::$extraStatics[$class] = array_merge_recursive($ar1, $ar2);
);
} }
} }
function parentClass() { function parentClass() {
return get_parent_class($this); return get_parent_class($this);
} }