BUGFIX: Fixed bugs in previous change to DOD

git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/branches/2.3@77849 467b73ca-7a2a-4603-9d3b-597d59a354a9
mateusz · Feb 2, 2011 · 9ff7f26 · 9ff7f26
1 parent 3cbf9ae
commit 9ff7f26
Showing 1 changed file with 5 additions and 2 deletions.
diff --git a/core/model/DataObjectDecorator.php b/core/model/DataObjectDecorator.php
@@ -33,7 +33,7 @@ abstract class DataObjectDecorator extends Extension {
 	 * Set the owner of this decorator.
 	 * @param DataObject $owner
 	 */
-	function setOwner(Object $owner) {
+	function setOwner(Object $owner, $ownerBaseClass = null) {
 		if(!($owner instanceof DataObject)) {
 			user_error(sprintf(
 				"DataObjectDecorator->setOwner(): Trying to decorate an object of class '%s' with '%s', 
@@ -44,7 +44,7 @@ function setOwner(Object $owner) {
 			return false;
 		}
 
-		parent::setOwner($owner);
+		parent::setOwner($owner, $ownerBaseClass);
 	}
 
 	/**
@@ -54,6 +54,9 @@ function loadExtraStatics() {
 		if(!empty(self::$extra_statics_loaded[$this->ownerBaseClass][$this->class])) return;
 		self::$extra_statics_loaded[$this->ownerBaseClass][$this->class] = true;
 
+		// If the extension has been manually applied to a subclass, we should ignore that.
+		if(Object::has_extension(get_parent_class($this->owner), $this->class)) return;
+
 		if($fields = $this->extraStatics()) {
 			foreach($fields as $relation => $fields) {
 				if(in_array($relation, self::$decoratable_statics)) {