| Index: branches/FileBackend/phase3/includes/filerepo/FSRepo.php |
| — | — | @@ -18,6 +18,5 @@ |
| 19 | 19 | if ( !( $this->backend instanceof FSFileBackend ) ) { |
| 20 | 20 | throw new MWException( "FSRepo only supports FSFileBackend." ); |
| 21 | 21 | } |
| 22 | | - //wfDeprecated( "FSRepo is deprecated, use FileRepo instead." ); |
| 23 | 22 | } |
| 24 | 23 | } |
| Index: branches/FileBackend/phase3/includes/filerepo/LocalRepo.php |
| — | — | @@ -10,9 +10,10 @@ |
| 11 | 11 | /** |
| 12 | 12 | * A repository that stores files in the local filesystem and registers them |
| 13 | 13 | * in the wiki's own database. This is the most commonly used repository class. |
| | 14 | + * |
| 14 | 15 | * @ingroup FileRepo |
| 15 | 16 | */ |
| 16 | | -class LocalRepo extends FSRepo { |
| | 17 | +class LocalRepo extends FileRepo { |
| 17 | 18 | var $fileFactory = array( 'LocalFile', 'newFromTitle' ); |
| 18 | 19 | var $fileFactoryKey = array( 'LocalFile', 'newFromKey' ); |
| 19 | 20 | var $oldFileFactory = array( 'OldLocalFile', 'newFromTitle' ); |
| — | — | @@ -22,7 +23,7 @@ |
| 23 | 24 | |
| 24 | 25 | /** |
| 25 | 26 | * @throws MWException |
| 26 | | - * @param $row |
| | 27 | + * @param $row |
| 27 | 28 | * @return File |
| 28 | 29 | */ |
| 29 | 30 | function newFileFromRow( $row ) { |
| — | — | @@ -87,6 +88,7 @@ |
| 88 | 89 | |
| 89 | 90 | /** |
| 90 | 91 | * Check if a deleted (filearchive) file has this sha1 key |
| | 92 | + * |
| 91 | 93 | * @param $key String File storage key (base-36 sha1 key with file extension) |
| 92 | 94 | * @param $lock String|null Use "lock" to lock the row via FOR UPDATE |
| 93 | 95 | * @return bool File with this key is in use |
| — | — | @@ -103,6 +105,7 @@ |
| 104 | 106 | |
| 105 | 107 | /** |
| 106 | 108 | * Check if a hidden (revision delete) file has this sha1 key |
| | 109 | + * |
| 107 | 110 | * @param $key String File storage key (base-36 sha1 key with file extension) |
| 108 | 111 | * @param $lock String|null Use "lock" to lock the row via FOR UPDATE |
| 109 | 112 | * @return bool File with this key is in use |
| — | — | @@ -185,6 +188,7 @@ |
| 186 | 189 | /** |
| 187 | 190 | * Function link Title::getArticleID(). |
| 188 | 191 | * We can't say Title object, what database it should use, so we duplicate that function here. |
| | 192 | + * |
| 189 | 193 | * @param $title Title |
| 190 | 194 | */ |
| 191 | 195 | protected function getArticleID( $title ) { |
| — | — | @@ -193,13 +197,13 @@ |
| 194 | 198 | } |
| 195 | 199 | $dbr = $this->getSlaveDB(); |
| 196 | 200 | $id = $dbr->selectField( |
| 197 | | - 'page', // Table |
| 198 | | - 'page_id', //Field |
| 199 | | - array( //Conditions |
| | 201 | + 'page', // Table |
| | 202 | + 'page_id', //Field |
| | 203 | + array( //Conditions |
| 200 | 204 | 'page_namespace' => $title->getNamespace(), |
| 201 | 205 | 'page_title' => $title->getDBkey(), |
| 202 | 206 | ), |
| 203 | | - __METHOD__ //Function name |
| | 207 | + __METHOD__ //Function name |
| 204 | 208 | ); |
| 205 | 209 | return $id; |
| 206 | 210 | } |
| — | — | @@ -207,6 +211,8 @@ |
| 208 | 212 | /** |
| 209 | 213 | * Get an array or iterator of file objects for files that have a given |
| 210 | 214 | * SHA-1 content hash. |
| | 215 | + * |
| | 216 | + * @param string |
| 211 | 217 | * @return Array |
| 212 | 218 | */ |
| 213 | 219 | function findBySha1( $hash ) { |
| — | — | @@ -244,6 +250,7 @@ |
| 245 | 251 | * Get a key on the primary cache for this repository. |
| 246 | 252 | * Returns false if the repository's cache is not accessible at this site. |
| 247 | 253 | * The parameters are the parts of the key, as for wfMemcKey(). |
| | 254 | + * |
| 248 | 255 | * @return string |
| 249 | 256 | */ |
| 250 | 257 | function getSharedCacheKey( /*...*/ ) { |