| Index: branches/wmf/1.19wmf1/includes/filerepo/backend/FileOp.php |
| — | — | @@ -143,13 +143,12 @@ |
| 144 | 144 | } else { |
| 145 | 145 | $status->success[$index] = false; |
| 146 | 146 | ++$status->failCount; |
| 147 | | - if ( !$ignoreErrors ) { |
| 148 | | - // Log remaining ops as failed for recovery... |
| 149 | | - for ( $i = ($index + 1); $i < count( $performOps ); $i++ ) { |
| 150 | | - $performOps[$i]->logFailure( 'attempt_aborted' ); |
| 151 | | - } |
| 152 | | - return $status; // bail out |
| | 147 | + // We can't continue (even with $ignoreErrors) as $predicates is wrong. |
| | 148 | + // Log the remaining ops as failed for recovery... |
| | 149 | + for ( $i = ($index + 1); $i < count( $performOps ); $i++ ) { |
| | 150 | + $performOps[$i]->logFailure( 'attempt_aborted' ); |
| 153 | 151 | } |
| | 152 | + return $status; // bail out |
| 154 | 153 | } |
| 155 | 154 | } |
| 156 | 155 | |
| Property changes on: branches/wmf/1.19wmf1/includes |
| ___________________________________________________________________ |
| Modified: svn:mergeinfo |
| 157 | 156 | Merged /trunk/phase3/includes:r113195 |
| Property changes on: branches/wmf/1.19wmf1 |
| ___________________________________________________________________ |
| Modified: svn:mergeinfo |
| 158 | 157 | Merged /trunk/phase3:r113195 |