| Index: trunk/phase3/includes/upload/UploadStash.php |
| — | — | @@ -472,7 +472,7 @@ |
| 473 | 473 | * A LocalFile wrapper around a file that has been temporarily stashed, so we can do things like create thumbnails for it |
| 474 | 474 | * Arguably UnregisteredLocalFile should be handling its own file repo but that class is a bit retarded currently |
| 475 | 475 | * |
| 476 | | - * @param $repo FSRepo: repository where we should find the path |
| | 476 | + * @param $repo FileRepo: repository where we should find the path |
| 477 | 477 | * @param $path String: path to file |
| 478 | 478 | * @param $key String: key to store the path and any stashed data under |
| 479 | 479 | * @throws UploadStashBadPathException |
| Index: trunk/phase3/includes/Setup.php |
| — | — | @@ -176,7 +176,7 @@ |
| 177 | 177 | ); |
| 178 | 178 | } else { |
| 179 | 179 | $wgForeignFileRepos[] = array( |
| 180 | | - 'class' => 'FSRepo', |
| | 180 | + 'class' => 'FileRepo', |
| 181 | 181 | 'name' => 'shared', |
| 182 | 182 | 'directory' => $wgSharedUploadDirectory, |
| 183 | 183 | 'url' => $wgSharedUploadPath, |
| Index: trunk/phase3/includes/filerepo/file/LocalFile.php |
| — | — | @@ -1730,7 +1730,7 @@ |
| 1731 | 1731 | $files[$src] = $this->file->repo->getVirtualUrl( 'public' ) . '/' . rawurlencode( $src ); |
| 1732 | 1732 | } |
| 1733 | 1733 | |
| 1734 | | - $result = $this->file->repo->fileExistsBatch( $files, FSRepo::FILES_ONLY ); |
| | 1734 | + $result = $this->file->repo->fileExistsBatch( $files, FileRepo::FILES_ONLY ); |
| 1735 | 1735 | |
| 1736 | 1736 | foreach ( $batch as $batchItem ) { |
| 1737 | 1737 | if ( $result[$batchItem[0]] ) { |
| — | — | @@ -2018,7 +2018,7 @@ |
| 2019 | 2019 | foreach ( $triplets as $file ) |
| 2020 | 2020 | $files[$file[0]] = $file[0]; |
| 2021 | 2021 | |
| 2022 | | - $result = $this->file->repo->fileExistsBatch( $files, FSRepo::FILES_ONLY ); |
| | 2022 | + $result = $this->file->repo->fileExistsBatch( $files, FileRepo::FILES_ONLY ); |
| 2023 | 2023 | |
| 2024 | 2024 | foreach ( $triplets as $file ) { |
| 2025 | 2025 | if ( $result[$file[0]] ) { |
| — | — | @@ -2041,7 +2041,7 @@ |
| 2042 | 2042 | rawurlencode( $repo->getDeletedHashPath( $file ) . $file ); |
| 2043 | 2043 | } |
| 2044 | 2044 | |
| 2045 | | - $result = $repo->fileExistsBatch( $files, FSRepo::FILES_ONLY ); |
| | 2045 | + $result = $repo->fileExistsBatch( $files, FileRepo::FILES_ONLY ); |
| 2046 | 2046 | |
| 2047 | 2047 | foreach ( $batch as $file ) { |
| 2048 | 2048 | if ( $result[$file] ) { |
| — | — | @@ -2264,7 +2264,7 @@ |
| 2265 | 2265 | } |
| 2266 | 2266 | |
| 2267 | 2267 | /** |
| 2268 | | - * Generate triplets for FSRepo::storeBatch(). |
| | 2268 | + * Generate triplets for FileRepo::storeBatch(). |
| 2269 | 2269 | */ |
| 2270 | 2270 | function getMoveTriplets() { |
| 2271 | 2271 | $moves = array_merge( array( $this->cur ), $this->olds ); |
| — | — | @@ -2290,7 +2290,7 @@ |
| 2291 | 2291 | $files[$file[0]] = $file[0]; |
| 2292 | 2292 | } |
| 2293 | 2293 | |
| 2294 | | - $result = $this->file->repo->fileExistsBatch( $files, FSRepo::FILES_ONLY ); |
| | 2294 | + $result = $this->file->repo->fileExistsBatch( $files, FileRepo::FILES_ONLY ); |
| 2295 | 2295 | $filteredTriplets = array(); |
| 2296 | 2296 | |
| 2297 | 2297 | foreach ( $triplets as $file ) { |
| Index: trunk/phase3/includes/filerepo/file/UnregisteredLocalFile.php |
| — | — | @@ -8,7 +8,7 @@ |
| 9 | 9 | |
| 10 | 10 | /** |
| 11 | 11 | * A file object referring to either a standalone local file, or a file in a |
| 12 | | - * local repository with no database, for example an FSRepo repository. |
| | 12 | + * local repository with no database, for example an FileRepo repository. |
| 13 | 13 | * |
| 14 | 14 | * Read-only. |
| 15 | 15 | * |
| — | — | @@ -50,7 +50,7 @@ |
| 51 | 51 | * |
| 52 | 52 | * @throws MWException |
| 53 | 53 | * @param $title Title|false |
| 54 | | - * @param $repo FSRepo |
| | 54 | + * @param $repo FileRepo |
| 55 | 55 | * @param $path string |
| 56 | 56 | * @param $mime string |
| 57 | 57 | */ |
| Index: trunk/phase3/includes/filerepo/file/File.php |
| — | — | @@ -760,7 +760,7 @@ |
| 761 | 761 | wfDebug( __METHOD__ . " transformation deferred." ); |
| 762 | 762 | // XXX: Pass in the storage path even though we are not rendering anything |
| 763 | 763 | // and the path is supposed to be an FS path. This is due to getScalerType() |
| 764 | | - // getting called on the path and clobbering the $thumb->getUrl() if it's false. |
| | 764 | + // getting called on the path and clobbering $thumb->getUrl() if it's false. |
| 765 | 765 | return $this->handler->getTransform( $this, $thumbPath, $thumbUrl, $params ); |
| 766 | 766 | } |
| 767 | 767 | |
| Index: trunk/phase3/includes/filerepo/FileRepo.php |
| — | — | @@ -1047,7 +1047,7 @@ |
| 1048 | 1048 | * If no valid deletion archive is configured, this may either delete the |
| 1049 | 1049 | * file or throw an exception, depending on the preference of the repository. |
| 1050 | 1050 | * |
| 1051 | | - * The overwrite policy is determined by the repository -- currently FSRepo |
| | 1051 | + * The overwrite policy is determined by the repository -- currently LocalRepo |
| 1052 | 1052 | * assumes a naming scheme in the deleted zone based on content hash, as |
| 1053 | 1053 | * opposed to the public zone which is assumed to be unique. |
| 1054 | 1054 | * |
| Index: trunk/phase3/includes/DefaultSettings.php |
| — | — | @@ -299,7 +299,8 @@ |
| 300 | 300 | * |
| 301 | 301 | * Properties required for all repos: |
| 302 | 302 | * - class The class name for the repository. May come from the core or an extension. |
| 303 | | - * The core repository classes are LocalRepo, ForeignDBRepo, FSRepo. |
| | 303 | + * The core repository classes are FileRepo, LocalRepo, ForeignDBRepo. |
| | 304 | + * FSRepo is also supported for backwards compatibility. |
| 304 | 305 | * |
| 305 | 306 | * - name A unique name for the repository (but $wgLocalFileRepo should be 'local'). |
| 306 | 307 | * |