From fd6a0f8fd35d3e5a1278aebaaca67eff5377e8a2 Mon Sep 17 00:00:00 2001 From: Sam Minnee Date: Mon, 4 Oct 2010 06:13:58 +0000 Subject: [PATCH] ENHANCEMENT: added language (Ticket #5390) (from r102899) git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@111656 467b73ca-7a2a-4603-9d3b-597d59a354a9 --- code/CMSMain.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/code/CMSMain.php b/code/CMSMain.php index cd61dddf..4e78a3a3 100755 --- a/code/CMSMain.php +++ b/code/CMSMain.php @@ -141,7 +141,7 @@ class CMSMain extends LeftAndMain implements CurrentPageIdentifier, PermissionPr return $this->getSiteTreeFor($this->stat('tree_class')); } - + public function generateDataTreeHints() { $classes = ClassInfo::subclassesFor( $this->stat('tree_class') ); @@ -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() && $record->canDeleteFromLive())) return Security::permissionFailure($this); + if($record && !$record->canDelete()) return Security::permissionFailure($this); $descRemoved = ''; $descendantsRemoved = 0;