| Index: branches/FileBackend/phase3/maintenance/locking/LockServerDaemon.php |
| — | — | @@ -159,7 +159,7 @@ |
| 160 | 160 | $data = @socket_read( $read_sock, 65535, PHP_NORMAL_READ ); |
| 161 | 161 | // Check if the client is disconnected |
| 162 | 162 | if ( $data === false ) { |
| 163 | | - // Remove client for $clients array |
| | 163 | + // Remove client from $clients list |
| 164 | 164 | $key = array_search( $read_sock, $clients ); |
| 165 | 165 | unset( $clients[$key] ); |
| 166 | 166 | // Remove socket's session from tracking (if it exists) |
| Index: branches/FileBackend/phase3/includes/filerepo/backend/FileOp.php |
| — | — | @@ -579,7 +579,7 @@ |
| 580 | 580 | */ |
| 581 | 581 | class CreateFileOp extends FileOp { |
| 582 | 582 | protected function allowedParams() { |
| 583 | | - return array( 'src', 'dst', 'overwriteDest', 'overwriteSame' ); |
| | 583 | + return array( 'content', 'dst', 'overwriteDest', 'overwriteSame' ); |
| 584 | 584 | } |
| 585 | 585 | |
| 586 | 586 | protected function doPrecheck( array &$predicates ) { |