Merge "mediawiki.api: Do not cache errors in getToken()"

[lhc/web/wiklou.git] / includes / filebackend / FileOpBatch.php

diff --git a/includes/filebackend/FileOpBatch.php b/includes/filebackend/FileOpBatch.php
index b42e140..56d7000 100644 (file)
--- a/includes/filebackend/FileOpBatch.php
+++ b/includes/filebackend/FileOpBatch.php
@@ -61,6 +61,7 @@ class FileOpBatch {
                $n = count( $performOps );
                if ( $n > self::MAX_BATCH_SIZE ) {
                        $status->fatal( 'backend-fail-batchsize', $n, self::MAX_BATCH_SIZE );
+
                        return $status;
                }
 
@@ -151,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;