From ec63a1092f2c81dc414b8aa9966b80f70e5c4d8c Mon Sep 17 00:00:00 2001
From: Sam Minnee <sam@silverstripe.com>
Date: Mon, 4 Oct 2010 06:14:05 +0000
Subject: [PATCH] MINOR: reverted wrong change (from r102901)

git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@111657 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 4e78a3a3..443f1b67 100755
--- a/code/CMSMain.php
+++ b/code/CMSMain.php
@@ -522,7 +522,7 @@ JS;
 	public function deletefromlive($data, $form) {
 		Versioned::reading_stage('Live');
 		$record = DataObject::get_by_id("SiteTree", $data['ID']);
-		if($record && !$record->canDelete()) return Security::permissionFailure($this);
+		if($record && !($record->canDelete() && $record->canDeleteFromLive())) return Security::permissionFailure($this);
 		
 		$descRemoved = '';
 		$descendantsRemoved = 0;