From c18923040db07cb939d436e0dc5ecd36be2f3528 Mon Sep 17 00:00:00 2001 From: Ingo Schommer Date: Sat, 21 Nov 2009 03:20:43 +0000 Subject: [PATCH] MINOR Fixed merge error git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@92842 467b73ca-7a2a-4603-9d3b-597d59a354a9 --- code/CMSBatchAction.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/code/CMSBatchAction.php b/code/CMSBatchAction.php index d04cb3f6..d998efb4 100644 --- a/code/CMSBatchAction.php +++ b/code/CMSBatchAction.php @@ -43,7 +43,7 @@ abstract class CMSBatchAction extends Object { * } * } */ - public function batchaction(DataObjectSet $pages, $helperMethod, $successMessage) { + public function batchaction(DataObjectSet $pages, $helperMethod, $successMessage, $arguments = array()) { $failures = 0; $status = array('modified' => array(), 'error' => array()); @@ -67,7 +67,7 @@ abstract class CMSBatchAction extends Object { Controller::curr()->getResponse()->setStatusCode( 200, - sprintf($successMessage, $pages->Count()) + sprintf($successMessage, $pages->Count(), count($status['error'])) ); return Convert::raw2json($status);