From c1d59185a9979add712dd6f7a098ca748f5de89f Mon Sep 17 00:00:00 2001 From: Ingo Schommer Date: Wed, 27 May 2009 02:09:18 +0000 Subject: [PATCH] BUGFIX Using new DBField->isChanged() in VirtualPage and SiteTree git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@77914 467b73ca-7a2a-4603-9d3b-597d59a354a9 --- core/model/SiteTree.php | 4 ++-- core/model/VirtualPage.php | 3 +-- 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/core/model/SiteTree.php b/core/model/SiteTree.php index 97dd149b2..78c29898a 100644 --- a/core/model/SiteTree.php +++ b/core/model/SiteTree.php @@ -982,7 +982,7 @@ class SiteTree extends DataObject implements PermissionProvider,i18nEntityProvid // If there is no URLSegment set, generate one from Title if((!$this->URLSegment || $this->URLSegment == 'new-page') && $this->Title) { $this->URLSegment = $this->generateURLSegment($this->Title); - } else if(isset($this->changed['URLSegment']) && $this->changed['URLSegment']) { + } else if($this->isChanged('URLSegment')) { // Make sure the URLSegment is valid for use in a URL $segment = ereg_replace('[^A-Za-z0-9]+','-',$this->URLSegment); $segment = ereg_replace('-+','-',$segment); @@ -1012,7 +1012,7 @@ class SiteTree extends DataObject implements PermissionProvider,i18nEntityProvid DataObject::set_context_obj(null); // If the URLSegment has been changed, rewrite links - if(isset($this->changed['URLSegment']) && $this->changed['URLSegment']) { + if($this->isChanged('URLSegment')) { if($this->hasMethod('BackLinkTracking')) { $links = $this->BackLinkTracking(); if($links) { diff --git a/core/model/VirtualPage.php b/core/model/VirtualPage.php index aa1a31184..8ffb769e1 100755 --- a/core/model/VirtualPage.php +++ b/core/model/VirtualPage.php @@ -100,8 +100,7 @@ class VirtualPage extends Page { // Don't do this stuff when we're publishing if(!$this->extension_instances['Versioned']->migratingVersion) { if( - isset($this->changed['CopyContentFromID']) - && $this->changed['CopyContentFromID'] + $this->isChanged('CopyContentFromID') && $this->CopyContentFromID != 0 && $this instanceof VirtualPage ) {