From 567612bd160c7c0431c67d1b629e67e29a576f95 Mon Sep 17 00:00:00 2001 From: Sam Minnee Date: Thu, 15 Oct 2009 21:58:24 +0000 Subject: [PATCH] MINOR can_edit_multiple fix MINOR fixed ie6 prompt defect MINOR track publish actions MINOR dont reset workflow if it's sitting at AwaitingEdit on save. (from r86251) git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@89167 467b73ca-7a2a-4603-9d3b-597d59a354a9 --- core/model/SiteTree.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/core/model/SiteTree.php b/core/model/SiteTree.php index e38d86f87..aa966f0b7 100755 --- a/core/model/SiteTree.php +++ b/core/model/SiteTree.php @@ -1034,7 +1034,7 @@ class SiteTree extends DataObject implements PermissionProvider,i18nEntityProvid $combinedStageResult = $combinedStageResult + $result; } - return $combinedStageResult; + return isset($combinedStageResult) ? $combinedStageResult : array(); /*