From 94fc673f975b341171cc6b6a263fb7d253c0e5d7 Mon Sep 17 00:00:00 2001
From: Kirti Nanji <kirtin@hotmail.com>
Date: Thu, 26 Jul 2007 21:57:01 +0000
Subject: [PATCH] DataObject decorator bug fixing - addStaticVars() function.

git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@39284 467b73ca-7a2a-4603-9d3b-597d59a354a9
---
 core/Object.php | 8 +++-----
 1 file changed, 3 insertions(+), 5 deletions(-)

diff --git a/core/Object.php b/core/Object.php
index 3bb97e52f..4f9efe63e 100755
--- a/core/Object.php
+++ b/core/Object.php
@@ -243,14 +243,12 @@ class Object {
 		if (empty(Object::$extraStatics[$class])) {
 			Object::$extraStatics[$class] = (array)$statics;
 		} else {
-			Object::$extraStatics[$class] = array_merge(
-				(array)Object::$extraStatics[$class],
-				(array)$statics
-			);
+			$ar1 = (array)Object::$extraStatics[$class]; // First Array To Merge
+			$ar2 = (array)$statics; // Second Array To Merge
+			Object::$extraStatics[$class] = array_merge_recursive($ar1, $ar2);
 		}
 	}
 	
-	
 	function parentClass() {
 		return get_parent_class($this);
 	}