Thijs/wiki.techinc.nl
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Cleaned up some references to FSRepo in code and comments. This should have no noticeable functional changes.

Browse source
This commit is contained in:
Aaron Schulz 2011-12-20 19:25:23 +00:00
parent a51a193f85
commit 14863b9aa5
7 changed files with 13 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
includes/DefaultSettings.php
View file

@ -299,7 +299,8 @@ $wgImgAuthPublicTest = true;
*
* Properties required for all repos:
* - class The class name for the repository. May come from the core or an extension.
* The core repository classes are LocalRepo, ForeignDBRepo, FSRepo.
* The core repository classes are FileRepo, LocalRepo, ForeignDBRepo.
* FSRepo is also supported for backwards compatibility.
*
* - name A unique name for the repository (but $wgLocalFileRepo should be 'local').
*

2
includes/Setup.php
View file

@ -176,7 +176,7 @@ if ( $wgUseSharedUploads ) {
);
} else {
$wgForeignFileRepos[] = array(
'class' => 'FSRepo',
'class' => 'FileRepo',
'name' => 'shared',
'directory' => $wgSharedUploadDirectory,
'url' => $wgSharedUploadPath,

2
includes/filerepo/FileRepo.php
View file

@ -1047,7 +1047,7 @@ class FileRepo {
* If no valid deletion archive is configured, this may either delete the
* file or throw an exception, depending on the preference of the repository.
*
* The overwrite policy is determined by the repository -- currently FSRepo
* The overwrite policy is determined by the repository -- currently LocalRepo
* assumes a naming scheme in the deleted zone based on content hash, as
* opposed to the public zone which is assumed to be unique.
*

2
includes/filerepo/file/File.php
View file

@ -760,7 +760,7 @@ abstract class File {
wfDebug( __METHOD__ . " transformation deferred." );
// XXX: Pass in the storage path even though we are not rendering anything
// and the path is supposed to be an FS path. This is due to getScalerType()
// getting called on the path and clobbering the $thumb->getUrl() if it's false.
// getting called on the path and clobbering $thumb->getUrl() if it's false.
return $this->handler->getTransform( $this, $thumbPath, $thumbUrl, $params );
}

10
includes/filerepo/file/LocalFile.php
View file

@ -1730,7 +1730,7 @@ class LocalFileDeleteBatch {
$files[$src] = $this->file->repo->getVirtualUrl( 'public' ) . '/' . rawurlencode( $src );
}
$result = $this->file->repo->fileExistsBatch( $files, FSRepo::FILES_ONLY );
$result = $this->file->repo->fileExistsBatch( $files, FileRepo::FILES_ONLY );
foreach ( $batch as $batchItem ) {
if ( $result[$batchItem[0]] ) {
@ -2018,7 +2018,7 @@ class LocalFileRestoreBatch {
foreach ( $triplets as $file )
$files[$file[0]] = $file[0];
$result = $this->file->repo->fileExistsBatch( $files, FSRepo::FILES_ONLY );
$result = $this->file->repo->fileExistsBatch( $files, FileRepo::FILES_ONLY );
foreach ( $triplets as $file ) {
if ( $result[$file[0]] ) {
@ -2041,7 +2041,7 @@ class LocalFileRestoreBatch {
rawurlencode( $repo->getDeletedHashPath( $file ) . $file );
}
$result = $repo->fileExistsBatch( $files, FSRepo::FILES_ONLY );
$result = $repo->fileExistsBatch( $files, FileRepo::FILES_ONLY );
foreach ( $batch as $file ) {
if ( $result[$file] ) {
@ -2264,7 +2264,7 @@ class LocalFileMoveBatch {
}
/**
* Generate triplets for FSRepo::storeBatch().
* Generate triplets for FileRepo::storeBatch().
*/
function getMoveTriplets() {
$moves = array_merge( array( $this->cur ), $this->olds );
@ -2290,7 +2290,7 @@ class LocalFileMoveBatch {
$files[$file[0]] = $file[0];
}
$result = $this->file->repo->fileExistsBatch( $files, FSRepo::FILES_ONLY );
$result = $this->file->repo->fileExistsBatch( $files, FileRepo::FILES_ONLY );
$filteredTriplets = array();
foreach ( $triplets as $file ) {

4
includes/filerepo/file/UnregisteredLocalFile.php
View file

@ -8,7 +8,7 @@
/**
* A file object referring to either a standalone local file, or a file in a
* local repository with no database, for example an FSRepo repository.
* local repository with no database, for example an FileRepo repository.
*
* Read-only.
*
@ -50,7 +50,7 @@ class UnregisteredLocalFile extends File {
*
* @throws MWException
* @param $title Title|false
* @param $repo FSRepo
* @param $repo FileRepo
* @param $path string
* @param $mime string
*/

2
includes/upload/UploadStash.php
View file

@ -472,7 +472,7 @@ class UploadStashFile extends UnregisteredLocalFile {
* A LocalFile wrapper around a file that has been temporarily stashed, so we can do things like create thumbnails for it
* Arguably UnregisteredLocalFile should be handling its own file repo but that class is a bit retarded currently
*
* @param $repo FSRepo: repository where we should find the path
* @param $repo FileRepo: repository where we should find the path
* @param $path String: path to file
* @param $key String: key to store the path and any stashed data under
* @throws UploadStashBadPathException