From 9ca21840a74b2b345bba65d9beb1233ec10798cb Mon Sep 17 00:00:00 2001 From: Victor Vasiliev Date: Sun, 29 Mar 2009 19:49:17 +0000 Subject: [PATCH] Fix a typo in the function name --- includes/filerepo/FSRepo.php | 4 ++-- includes/filerepo/LocalFile.php | 10 +++++----- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/includes/filerepo/FSRepo.php b/includes/filerepo/FSRepo.php index 5a868e20f2..95158cdaae 100644 --- a/includes/filerepo/FSRepo.php +++ b/includes/filerepo/FSRepo.php @@ -213,12 +213,12 @@ class FSRepo extends FileRepo { } /** - * Checks existance of specified array of files. + * Checks existence of specified array of files. * * @param array $files URLs of files to check * @param integer $flags Bitwise combination of the following flags: * self::FILES_ONLY Mark file as existing only if it is a file (not directory) - * @return Either array of files and existance flags, or false + * @return Either array of files and existence flags, or false */ function fileExistsBatch( $files, $flags = 0 ) { if ( !file_exists( $this->directory ) || !is_readable( $this->directory ) ) { diff --git a/includes/filerepo/LocalFile.php b/includes/filerepo/LocalFile.php index 710a605cad..7a3a0bd203 100644 --- a/includes/filerepo/LocalFile.php +++ b/includes/filerepo/LocalFile.php @@ -1789,9 +1789,9 @@ class LocalFileMoveBatch { $status = $repo->newGood(); $triplets = $this->getMoveTriplets(); - $statusPreCheck = $this->checkFileExistance( 0 ); + $statusPreCheck = $this->checkFileExistence( 0 ); if( !$statusPreCheck->isOk() ) { - wfDebugLog( 'imagemove', "Move of {$this->file->name} aborted due to pre-move file existance check failure" ); + wfDebugLog( 'imagemove', "Move of {$this->file->name} aborted due to pre-move file existence check failure" ); return $statusPreCheck; } $statusDb = $this->doDBUpdates(); @@ -1802,7 +1802,7 @@ class LocalFileMoveBatch { wfDebugLog( 'imagemove', "Error in moving files: " . $statusMove->getWikiText() ); $this->db->rollback(); } else { - $statusPostCheck = $this->checkFileExistance( 1 ); + $statusPostCheck = $this->checkFileExistence( 1 ); if( !$statusPostCheck->isOk() ) { // This clearly mustn't have happend. FSRepo::storeBatch should have given out an error in that case. wfDebugLog( 'imagemove', "ATTENTION! Move of {$this->file->name} has some files missing, while storeBatch() reported success" ); @@ -1870,11 +1870,11 @@ class LocalFileMoveBatch { } /* - * Checks file existance. + * Checks file existence. * Set $key = 0 for source files check * and $key = 1 for destination files check. */ - function checkFileExistance( $key = 0 ) { + function checkFileExistence( $key = 0 ) { $files = array(); foreach( array_merge( array( $this->cur ), $this->olds ) as $file ) $files[$file[$key]] = $this->file->repo->getVirtualUrl() . '/public/' . rawurlencode( $file[$key] ); -- 2.20.1