| Index: branches/FileBackend/phase3/tests/phpunit/includes/filerepo/FileBackendTest.php |
| — | — | @@ -343,11 +343,11 @@ |
| 344 | 344 | ); |
| 345 | 345 | $expContent .= $srcsContent[$i]; |
| 346 | 346 | } |
| 347 | | - $dest = $op['dst']; |
| 348 | 347 | $status = $this->backend->doOperations( $ops ); |
| 349 | 348 | |
| 350 | | - $this->assertEquals( true, $status->isOK(), "Creation of concat file at $dest succeeded." ); |
| | 349 | + $this->assertEquals( true, $status->isOK(), "Creation of source files succeeded." ); |
| 351 | 350 | |
| | 351 | + $dest = $op['dst']; |
| 352 | 352 | if ( $alreadyExists ) { |
| 353 | 353 | $oldText = 'blah...blah...waahwaah'; |
| 354 | 354 | $status = $this->backend->doOperation( |
| Index: branches/FileBackend/phase3/includes/filerepo/backend/FileOp.php |
| — | — | @@ -811,7 +811,7 @@ |
| 812 | 812 | */ |
| 813 | 813 | class ConcatenateFileOp extends FileOp { |
| 814 | 814 | protected function allowedParams() { |
| 815 | | - return array( 'src', 'dst', 'overwriteDest' ); |
| | 815 | + return array( 'srcs', 'dst', 'overwriteDest' ); |
| 816 | 816 | } |
| 817 | 817 | |
| 818 | 818 | protected function doPrecheck( array &$predicates ) { |