r33920 MediaWiki - Code Review archive

Repository:MediaWiki
Revision:r33919‎ | r33920 | r33921 >
Date:18:16, 26 April 2008
Author:brion
Status:old
Tags:
Comment:
Revert r33911 for now -- causes fatal error death with OggHandler at least.
Probably needs some cleanup to see which of these are actually supposed to be used statically.
Modified paths:
  • /trunk/phase3/RELEASE-NOTES (modified) (history)
  • /trunk/phase3/includes/filerepo/FileRepoStatus.php (modified) (history)
  • /trunk/phase3/includes/media/Generic.php (modified) (history)
  • /trunk/phase3/includes/media/SVG.php (modified) (history)

Diff [purge]

Index: trunk/phase3/includes/filerepo/FileRepoStatus.php
@@ -7,7 +7,7 @@
88 /**
99 * Factory function for fatal errors
1010 */
11 - static function newFatal( $repo /*, $message , parameters...*/ ) {
 11+ static function newFatal( $repo, $message /*, parameters...*/ ) {
1212 $params = array_slice( func_get_args(), 1 );
1313 $result = new self( $repo );
1414 call_user_func_array( array( &$result, 'error' ), $params );
Index: trunk/phase3/includes/media/Generic.php
@@ -224,14 +224,14 @@
225225 );
226226 }
227227
228 - static function getShortDesc( $file ) {
 228+ function getShortDesc( $file ) {
229229 global $wgLang;
230230 $nbytes = '(' . wfMsgExt( 'nbytes', array( 'parsemag', 'escape' ),
231231 $wgLang->formatNum( $file->getSize() ) ) . ')';
232232 return "$nbytes";
233233 }
234234
235 - static function getLongDesc( $file ) {
 235+ function getLongDesc( $file ) {
236236 global $wgUser;
237237 $sk = $wgUser->getSkin();
238238 return wfMsg( 'file-info', $sk->formatSize( $file->getSize() ), $file->getMimeType() );
@@ -398,7 +398,7 @@
399399 return $gis;
400400 }
401401
402 - static function getShortDesc( $file ) {
 402+ function getShortDesc( $file ) {
403403 global $wgLang;
404404 $nbytes = wfMsgExt( 'nbytes', array( 'parsemag', 'escape' ),
405405 $wgLang->formatNum( $file->getSize() ) );
@@ -407,7 +407,7 @@
408408 return "$widthheight ($nbytes)";
409409 }
410410
411 - static function getLongDesc( $file ) {
 411+ function getLongDesc( $file ) {
412412 global $wgLang;
413413 return wfMsgHtml('file-info-size', $wgLang->formatNum( $file->getWidth() ), $wgLang->formatNum( $file->getHeight() ),
414414 $wgLang->formatSize( $file->getSize() ), $file->getMimeType() );
Index: trunk/phase3/includes/media/SVG.php
@@ -92,7 +92,7 @@
9393 return array( 'png', 'image/png' );
9494 }
9595
96 - static function getLongDesc( $file ) {
 96+ function getLongDesc( $file ) {
9797 global $wgLang;
9898 return wfMsg( 'svg-long-desc', $file->getWidth(), $file->getHeight(),
9999 $wgLang->formatSize( $file->getSize() ) );
Index: trunk/phase3/RELEASE-NOTES
@@ -216,8 +216,8 @@
217217 * (bug 13816) Filter by main namespace doesn't work on WhatLinksHere
218218 * (bug 13822) Fatal error on some pages when calculating subpage subtitle
219219 * (bug 13824) AJAX search suggestion now works with non-SkinTemplate skins
220 -* (bug 13643) Fixed some PHP Strict Standards errors
221220
 221+
222222 === API changes in 1.13 ===
223223
224224 * Fixing main page display in meta=siteinfo

Past revisions this follows-up on

RevisionCommit summaryAuthorDate
r33911(bug 13643) Fixed some PHP Strict Standards errorsialex14:45, 26 April 2008

Status & tagging log