From 53b02f6d99f80c0147b8e5d7fd35227764422229 Mon Sep 17 00:00:00 2001 From: Ingo Schommer Date: Thu, 27 May 2010 21:29:48 +0000 Subject: [PATCH] BUGFIX Moved SiteTree?->ParentID property to Hierarchy extension (fixes #5638) (from r105668) git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@105786 467b73ca-7a2a-4603-9d3b-597d59a354a9 --- core/model/Hierarchy.php | 9 +++++++++ core/model/SiteTree.php | 4 ---- 2 files changed, 9 insertions(+), 4 deletions(-) diff --git a/core/model/Hierarchy.php b/core/model/Hierarchy.php index 3a858b7e9..8ddc13ea0 100755 --- a/core/model/Hierarchy.php +++ b/core/model/Hierarchy.php @@ -24,6 +24,15 @@ class Hierarchy extends DataObjectDecorator { function augmentWrite(&$manipulation) { } + + function extraStatics($class = null) { + return array( + 'has_one' => array( + // TODO this method is called *both* statically and on an instance + "Parent" => ($class) ? $class : $this->owner->class + ) + ); + } /** * Returns the children of this DataObject as an XHTML UL. This will be called recursively on each child, diff --git a/core/model/SiteTree.php b/core/model/SiteTree.php index bed72a77b..dbec7907b 100755 --- a/core/model/SiteTree.php +++ b/core/model/SiteTree.php @@ -123,10 +123,6 @@ class SiteTree extends DataObject implements PermissionProvider,i18nEntityProvid "CanEditType" => "Inherit" ); - static $has_one = array( - "Parent" => "SiteTree" - ); - static $versioning = array( "Stage", "Live" );