| Index: trunk/phase3/includes/filerepo/LocalFile.php |
| — | — | @@ -1789,9 +1789,9 @@ |
| 1790 | 1790 | $status = $repo->newGood(); |
| 1791 | 1791 | $triplets = $this->getMoveTriplets(); |
| 1792 | 1792 | |
| 1793 | | - $statusPreCheck = $this->checkFileExistance( 0 ); |
| | 1793 | + $statusPreCheck = $this->checkFileExistence( 0 ); |
| 1794 | 1794 | if( !$statusPreCheck->isOk() ) { |
| 1795 | | - wfDebugLog( 'imagemove', "Move of {$this->file->name} aborted due to pre-move file existance check failure" ); |
| | 1795 | + wfDebugLog( 'imagemove', "Move of {$this->file->name} aborted due to pre-move file existence check failure" ); |
| 1796 | 1796 | return $statusPreCheck; |
| 1797 | 1797 | } |
| 1798 | 1798 | $statusDb = $this->doDBUpdates(); |
| — | — | @@ -1802,7 +1802,7 @@ |
| 1803 | 1803 | wfDebugLog( 'imagemove', "Error in moving files: " . $statusMove->getWikiText() ); |
| 1804 | 1804 | $this->db->rollback(); |
| 1805 | 1805 | } else { |
| 1806 | | - $statusPostCheck = $this->checkFileExistance( 1 ); |
| | 1806 | + $statusPostCheck = $this->checkFileExistence( 1 ); |
| 1807 | 1807 | if( !$statusPostCheck->isOk() ) { |
| 1808 | 1808 | // This clearly mustn't have happend. FSRepo::storeBatch should have given out an error in that case. |
| 1809 | 1809 | wfDebugLog( 'imagemove', "ATTENTION! Move of {$this->file->name} has some files missing, while storeBatch() reported success" ); |
| — | — | @@ -1870,11 +1870,11 @@ |
| 1871 | 1871 | } |
| 1872 | 1872 | |
| 1873 | 1873 | /* |
| 1874 | | - * Checks file existance. |
| | 1874 | + * Checks file existence. |
| 1875 | 1875 | * Set $key = 0 for source files check |
| 1876 | 1876 | * and $key = 1 for destination files check. |
| 1877 | 1877 | */ |
| 1878 | | - function checkFileExistance( $key = 0 ) { |
| | 1878 | + function checkFileExistence( $key = 0 ) { |
| 1879 | 1879 | $files = array(); |
| 1880 | 1880 | foreach( array_merge( array( $this->cur ), $this->olds ) as $file ) |
| 1881 | 1881 | $files[$file[$key]] = $this->file->repo->getVirtualUrl() . '/public/' . rawurlencode( $file[$key] ); |
| Index: trunk/phase3/includes/filerepo/FSRepo.php |
| — | — | @@ -213,12 +213,12 @@ |
| 214 | 214 | } |
| 215 | 215 | |
| 216 | 216 | /** |
| 217 | | - * Checks existance of specified array of files. |
| | 217 | + * Checks existence of specified array of files. |
| 218 | 218 | * |
| 219 | 219 | * @param array $files URLs of files to check |
| 220 | 220 | * @param integer $flags Bitwise combination of the following flags: |
| 221 | 221 | * self::FILES_ONLY Mark file as existing only if it is a file (not directory) |
| 222 | | - * @return Either array of files and existance flags, or false |
| | 222 | + * @return Either array of files and existence flags, or false |
| 223 | 223 | */ |
| 224 | 224 | function fileExistsBatch( $files, $flags = 0 ) { |
| 225 | 225 | if ( !file_exists( $this->directory ) || !is_readable( $this->directory ) ) { |