From b7a9287844822b17ff8e6b0c74ab103fb2f6b677 Mon Sep 17 00:00:00 2001
From: Will Rossiter <will@silverstripe.com>
Date: Mon, 12 Apr 2010 03:02:05 +0000
Subject: [PATCH] BUGFIX: delete from published site never calls
 canDeleteFromLive(). (via marcus #5364)

git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/branches/2.4@102386 467b73ca-7a2a-4603-9d3b-597d59a354a9
---
 code/CMSMain.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/code/CMSMain.php b/code/CMSMain.php
index 850f1348..53144431 100755
--- a/code/CMSMain.php
+++ b/code/CMSMain.php
@@ -595,7 +595,7 @@ JS;
 		$id = $_REQUEST['ID'];
 		Versioned::reading_stage('Live');
 		$record = DataObject::get_by_id("SiteTree", $id);
-		if($record && !$record->canDelete()) return Security::permissionFailure($this);
+		if($record && !($record->canDelete() && $record->canDeleteFromLive())) return Security::permissionFailure($this);
 		
 		$descRemoved = '';
 		$descendantsRemoved = 0;