From 76f15e47bf8135894086dcbb3613a2e6e31fea42 Mon Sep 17 00:00:00 2001 From: Sean Harvey Date: Thu, 20 Nov 2008 08:07:22 +0000 Subject: [PATCH] MINOR Removed old references from workflow in SiteTree and VirtualPage (AssignedToID and RequestedByID were old properites of a workflow page type) git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/branches/2.3@66311 467b73ca-7a2a-4603-9d3b-597d59a354a9 --- core/model/SiteTree.php | 12 ++---------- core/model/VirtualPage.php | 2 -- 2 files changed, 2 insertions(+), 12 deletions(-) diff --git a/core/model/SiteTree.php b/core/model/SiteTree.php index 066f7c98d..aa7b9e5dc 100644 --- a/core/model/SiteTree.php +++ b/core/model/SiteTree.php @@ -1315,8 +1315,6 @@ class SiteTree extends DataObject { // Handle activities undertaken by decorators $this->extend('onBeforePublish', $original); - $this->AssignedToID = 0; - $this->RequestedByID = 0; $this->Status = "Published"; //$this->PublishedByID = Member::currentUser()->ID; $this->write(); @@ -1358,8 +1356,6 @@ class SiteTree extends DataObject { */ function doRollbackTo($version) { $this->publish($version, "Stage", true); - $this->AssignedToID = 0; - $this->RequestedByID = 0; $this->Status = "Saved (update)"; $this->writeWithoutVersion(); } @@ -1372,8 +1368,6 @@ class SiteTree extends DataObject { // Use a clone to get the updates made by $this->publish $clone = DataObject::get_by_id("SiteTree", $this->ID); - $clone->AssignedToID = 0; - $clone->RequestedByID = 0; $clone->Status = "Published"; $clone->writeWithoutVersion(); } @@ -1391,11 +1385,9 @@ class SiteTree extends DataObject { * Changing the condition from empty($this->ID) to * !$this->ID && !$this->record['ID'] fixed this. */ - if(empty($this->ID)) - return true; + if(empty($this->ID)) return true; - if(is_numeric($this->ID)) - return false; + if(is_numeric($this->ID)) return false; return stripos($this->ID, 'new') === 0; } diff --git a/core/model/VirtualPage.php b/core/model/VirtualPage.php index 9f4073e83..c3cbc2d66 100755 --- a/core/model/VirtualPage.php +++ b/core/model/VirtualPage.php @@ -28,8 +28,6 @@ class VirtualPage extends Page { $nonVirtualFields = array( "SecurityTypeID", "OwnerID", - "AssignedToID", - "RequestedByID", "URLSegment", "Sort", "Status",