From: Aaron Schulz <aschulz@wikimedia.org>
Date: Fri, 18 Apr 2014 18:02:23 +0000 (-0700)
Subject: Made runParallelBatches() fully set the status array on abort
X-Git-Tag: 1.31.0-rc.0~16160^2
X-Git-Url: http://git.cyclocoop.org/%40spipnet%40?a=commitdiff_plain;h=62505ef38d924d35c832bcb71fdd6b51c3a01902;p=lhc%2Fweb%2Fwiklou.git

Made runParallelBatches() fully set the status array on abort

Change-Id: Ie35b28b85e734db6910a42ed384374ba3d594a8e
---

diff --git a/includes/filebackend/FileOpBatch.php b/includes/filebackend/FileOpBatch.php
index e90fcb7820..56d7000982 100644
--- a/includes/filebackend/FileOpBatch.php
+++ b/includes/filebackend/FileOpBatch.php
@@ -152,6 +152,8 @@ class FileOpBatch {
 				// We can't continue (even with $ignoreErrors) as $predicates is wrong.
 				// Log the remaining ops as failed for recovery...
 				foreach ( $performOpsBatch as $i => $fileOp ) {
+					$status->success[$i] = false;
+					++$status->failCount;
 					$performOpsBatch[$i]->logFailure( 'attempt_aborted' );
 				}
 				continue;