| Index: trunk/phase3/includes/filerepo/File.php |
| — | — | @@ -135,15 +135,13 @@ |
| 136 | 136 | |
| 137 | 137 | /** |
| 138 | 138 | * Return the associated title object |
| 139 | | - * @public |
| 140 | 139 | */ |
| 141 | | - function getTitle() { return $this->title; } |
| | 140 | + public function getTitle() { return $this->title; } |
| 142 | 141 | |
| 143 | 142 | /** |
| 144 | 143 | * Return the URL of the file |
| 145 | | - * @public |
| 146 | 144 | */ |
| 147 | | - function getUrl() { |
| | 145 | + public function getUrl() { |
| 148 | 146 | if ( !isset( $this->url ) ) { |
| 149 | 147 | $this->url = $this->repo->getZoneUrl( 'public' ) . '/' . $this->getUrlRel(); |
| 150 | 148 | } |
| — | — | @@ -188,10 +186,8 @@ |
| 189 | 187 | * or in hashed paths like /images/3/3c. |
| 190 | 188 | * |
| 191 | 189 | * May return false if the file is not locally accessible. |
| 192 | | - * |
| 193 | | - * @public |
| 194 | 190 | */ |
| 195 | | - function getPath() { |
| | 191 | + public function getPath() { |
| 196 | 192 | if ( !isset( $this->path ) ) { |
| 197 | 193 | $this->path = $this->repo->getZonePath('public') . '/' . $this->getRel(); |
| 198 | 194 | } |
| — | — | @@ -200,9 +196,8 @@ |
| 201 | 197 | |
| 202 | 198 | /** |
| 203 | 199 | * Alias for getPath() |
| 204 | | - * @public |
| 205 | 200 | */ |
| 206 | | - function getFullPath() { |
| | 201 | + public function getFullPath() { |
| 207 | 202 | return $this->getPath(); |
| 208 | 203 | } |
| 209 | 204 | |
| — | — | @@ -600,7 +595,7 @@ |
| 601 | 596 | * STUB |
| 602 | 597 | * Overridden by LocalFile |
| 603 | 598 | */ |
| 604 | | - function purgeCache( $archiveFiles = array() ) {} |
| | 599 | + function purgeCache() {} |
| 605 | 600 | |
| 606 | 601 | /** |
| 607 | 602 | * Purge the file description page, but don't go after |
| — | — | @@ -902,7 +897,7 @@ |
| 903 | 898 | * STUB |
| 904 | 899 | * Overridden by LocalFile |
| 905 | 900 | */ |
| 906 | | - function delete( $reason, $suppress=false ) { |
| | 901 | + function delete( $reason ) { |
| 907 | 902 | $this->readOnlyError(); |
| 908 | 903 | } |
| 909 | 904 | |
| Index: trunk/phase3/includes/media/Generic.php |
| — | — | @@ -191,7 +191,7 @@ |
| 192 | 192 | * to do things like visual indication of grouped and chained streams |
| 193 | 193 | * in ogg container files. |
| 194 | 194 | */ |
| 195 | | - function formatMetadata( $image, $metadata ) { |
| | 195 | + function formatMetadata( $image ) { |
| 196 | 196 | return false; |
| 197 | 197 | } |
| 198 | 198 | |
| — | — | @@ -224,7 +224,7 @@ |
| 225 | 225 | return wfMsg( 'file-info', $sk->formatSize( $file->getSize() ), $file->getMimeType() ); |
| 226 | 226 | } |
| 227 | 227 | |
| 228 | | - function getDimensionsString() { |
| | 228 | + function getDimensionsString( $file ) { |
| 229 | 229 | return ''; |
| 230 | 230 | } |
| 231 | 231 | |