From dfa6b99f18db0d3209a59cbff9efca76b6d9593c Mon Sep 17 00:00:00 2001 From: Ingo Schommer Date: Sat, 15 Sep 2007 00:46:22 +0000 Subject: [PATCH] elofgren: VAR FIXES: Fix 2 undefined variable errors in CMSMain::deletefromlive() and 1 in CMSMain::deleteitems() that showed up in status messages while deleting pages. (merged from branches/gsoc) git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@41842 467b73ca-7a2a-4603-9d3b-597d59a354a9 --- code/CMSMain.php | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/code/CMSMain.php b/code/CMSMain.php index 27030a2c..5d857176 100644 --- a/code/CMSMain.php +++ b/code/CMSMain.php @@ -427,6 +427,8 @@ JS; if(isset($descendantsRemoved)) { $descRemoved = " and $descendantsRemoved descendants"; + } else { + $descRemoved = ''; } $title = Convert::raw2js($record->Title); @@ -937,7 +939,7 @@ HTML; $s = sizeof($ids) > 1 ? "s" : ""; $message = sizeof($ids) . " page$s deleted."; - if($brokenPageList != '') { + if(isset($brokenPageList) && $brokenPageList != '') { $message .= " The following pages now have broken links:Their owners have been emailed and they will fix up those pages."; }