| Index: trunk/phase3/includes/filerepo/FileRepoStatus.php |
| — | — | @@ -7,7 +7,7 @@ |
| 8 | 8 | /** |
| 9 | 9 | * Factory function for fatal errors |
| 10 | 10 | */ |
| 11 | | - static function newFatal( $repo, $message /*, parameters...*/ ) { |
| | 11 | + static function newFatal( $repo /*, $message , parameters...*/ ) { |
| 12 | 12 | $params = array_slice( func_get_args(), 1 ); |
| 13 | 13 | $result = new self( $repo ); |
| 14 | 14 | call_user_func_array( array( &$result, 'error' ), $params ); |
| Index: trunk/phase3/includes/media/Generic.php |
| — | — | @@ -224,14 +224,14 @@ |
| 225 | 225 | ); |
| 226 | 226 | } |
| 227 | 227 | |
| 228 | | - function getShortDesc( $file ) { |
| | 228 | + static function getShortDesc( $file ) { |
| 229 | 229 | global $wgLang; |
| 230 | 230 | $nbytes = '(' . wfMsgExt( 'nbytes', array( 'parsemag', 'escape' ), |
| 231 | 231 | $wgLang->formatNum( $file->getSize() ) ) . ')'; |
| 232 | 232 | return "$nbytes"; |
| 233 | 233 | } |
| 234 | 234 | |
| 235 | | - function getLongDesc( $file ) { |
| | 235 | + static function getLongDesc( $file ) { |
| 236 | 236 | global $wgUser; |
| 237 | 237 | $sk = $wgUser->getSkin(); |
| 238 | 238 | return wfMsg( 'file-info', $sk->formatSize( $file->getSize() ), $file->getMimeType() ); |
| — | — | @@ -398,7 +398,7 @@ |
| 399 | 399 | return $gis; |
| 400 | 400 | } |
| 401 | 401 | |
| 402 | | - function getShortDesc( $file ) { |
| | 402 | + static function getShortDesc( $file ) { |
| 403 | 403 | global $wgLang; |
| 404 | 404 | $nbytes = wfMsgExt( 'nbytes', array( 'parsemag', 'escape' ), |
| 405 | 405 | $wgLang->formatNum( $file->getSize() ) ); |
| — | — | @@ -407,7 +407,7 @@ |
| 408 | 408 | return "$widthheight ($nbytes)"; |
| 409 | 409 | } |
| 410 | 410 | |
| 411 | | - function getLongDesc( $file ) { |
| | 411 | + static function getLongDesc( $file ) { |
| 412 | 412 | global $wgLang; |
| 413 | 413 | return wfMsgHtml('file-info-size', $wgLang->formatNum( $file->getWidth() ), $wgLang->formatNum( $file->getHeight() ), |
| 414 | 414 | $wgLang->formatSize( $file->getSize() ), $file->getMimeType() ); |
| Index: trunk/phase3/includes/media/SVG.php |
| — | — | @@ -92,7 +92,7 @@ |
| 93 | 93 | return array( 'png', 'image/png' ); |
| 94 | 94 | } |
| 95 | 95 | |
| 96 | | - function getLongDesc( $file ) { |
| | 96 | + static function getLongDesc( $file ) { |
| 97 | 97 | global $wgLang; |
| 98 | 98 | return wfMsg( 'svg-long-desc', $file->getWidth(), $file->getHeight(), |
| 99 | 99 | $wgLang->formatSize( $file->getSize() ) ); |
| Index: trunk/phase3/RELEASE-NOTES |
| — | — | @@ -216,8 +216,8 @@ |
| 217 | 217 | * (bug 13816) Filter by main namespace doesn't work on WhatLinksHere |
| 218 | 218 | * (bug 13822) Fatal error on some pages when calculating subpage subtitle |
| 219 | 219 | * (bug 13824) AJAX search suggestion now works with non-SkinTemplate skins |
| | 220 | +* (bug 13643) Fixed some PHP Strict Standards errors |
| 220 | 221 | |
| 221 | | - |
| 222 | 222 | === API changes in 1.13 === |
| 223 | 223 | |
| 224 | 224 | * Fixing main page display in meta=siteinfo |