mirror of
https://github.com/silverstripe/silverstripe-reports
synced 2024-10-22 09:05:53 +00:00
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
This commit is contained in:
parent
8f980e1e02
commit
dfa6b99f18
@ -427,6 +427,8 @@ JS;
|
|||||||
|
|
||||||
if(isset($descendantsRemoved)) {
|
if(isset($descendantsRemoved)) {
|
||||||
$descRemoved = " and $descendantsRemoved descendants";
|
$descRemoved = " and $descendantsRemoved descendants";
|
||||||
|
} else {
|
||||||
|
$descRemoved = '';
|
||||||
}
|
}
|
||||||
|
|
||||||
$title = Convert::raw2js($record->Title);
|
$title = Convert::raw2js($record->Title);
|
||||||
@ -937,7 +939,7 @@ HTML;
|
|||||||
|
|
||||||
$s = sizeof($ids) > 1 ? "s" : "";
|
$s = sizeof($ids) > 1 ? "s" : "";
|
||||||
$message = sizeof($ids) . " page$s deleted.";
|
$message = sizeof($ids) . " page$s deleted.";
|
||||||
if($brokenPageList != '') {
|
if(isset($brokenPageList) && $brokenPageList != '') {
|
||||||
$message .= " The following pages now have broken links:<ul>" . addslashes($brokenPageList) . "</ul>Their owners have been emailed and they will fix up those pages.";
|
$message .= " The following pages now have broken links:<ul>" . addslashes($brokenPageList) . "</ul>Their owners have been emailed and they will fix up those pages.";
|
||||||
}
|
}
|
||||||
|
|
||||||
|
Loading…
x
Reference in New Issue
Block a user