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.

diff --git a/RELEASE-NOTES b/RELEASE-NOTES
index 03e0351..5d6b4a9 100644 (file)
--- a/RELEASE-NOTES
+++ b/RELEASE-NOTES
@@ -216,7 +216,7 @@ it from source control: http://www.mediawiki.org/wiki/Download_from_SVN
 * (bug 13816) Filter by main namespace doesn't work on WhatLinksHere
 * (bug 13822) Fatal error on some pages when calculating subpage subtitle
 * (bug 13824) AJAX search suggestion now works with non-SkinTemplate skins
-* (bug 13643) Fixed some PHP Strict Standards errors
+
 
 === API changes in 1.13 ===
 

diff --git a/includes/filerepo/FileRepoStatus.php b/includes/filerepo/FileRepoStatus.php
index d681c46..7e473db 100644 (file)
--- a/includes/filerepo/FileRepoStatus.php
+++ b/includes/filerepo/FileRepoStatus.php
@@ -7,7 +7,7 @@ class FileRepoStatus extends Status {
        /**
         * Factory function for fatal errors
         */
-       static function newFatal( $repo /*, $message , parameters...*/ ) {
+       static function newFatal( $repo, $message /*, parameters...*/ ) {
                $params = array_slice( func_get_args(), 1 );
                $result = new self( $repo );
                call_user_func_array( array( &$result, 'error' ), $params );

diff --git a/includes/media/Generic.php b/includes/media/Generic.php
index 135f783..8c3ed06 100644 (file)
--- a/includes/media/Generic.php
+++ b/includes/media/Generic.php
@@ -224,14 +224,14 @@ abstract class MediaHandler {
                );
        }
 
-       static function getShortDesc( $file ) {
+       function getShortDesc( $file ) {
                global $wgLang;
                $nbytes = '(' . wfMsgExt( 'nbytes', array( 'parsemag', 'escape' ),
                        $wgLang->formatNum( $file->getSize() ) ) . ')';
                return "$nbytes";
        }
 
-       static function getLongDesc( $file ) {
+       function getLongDesc( $file ) {
                global $wgUser;
                $sk = $wgUser->getSkin();
                return wfMsg( 'file-info', $sk->formatSize( $file->getSize() ), $file->getMimeType() );
@@ -398,7 +398,7 @@ abstract class ImageHandler extends MediaHandler {
                return $gis;
        }
 
-       static function getShortDesc( $file ) {
+       function getShortDesc( $file ) {
                global $wgLang;
                $nbytes = wfMsgExt( 'nbytes', array( 'parsemag', 'escape' ),
                        $wgLang->formatNum( $file->getSize() ) );
@@ -407,7 +407,7 @@ abstract class ImageHandler extends MediaHandler {
                return "$widthheight ($nbytes)";
        }
 
-       static function getLongDesc( $file ) {
+       function getLongDesc( $file ) {
                global $wgLang;
                return wfMsgHtml('file-info-size', $wgLang->formatNum( $file->getWidth() ), $wgLang->formatNum( $file->getHeight() ),
                        $wgLang->formatSize( $file->getSize() ), $file->getMimeType() );

diff --git a/includes/media/SVG.php b/includes/media/SVG.php
index c06f889..698e10e 100644 (file)
--- a/includes/media/SVG.php
+++ b/includes/media/SVG.php
@@ -92,7 +92,7 @@ class SvgHandler extends ImageHandler {
                return array( 'png', 'image/png' );
        }
 
-       static function getLongDesc( $file ) {
+       function getLongDesc( $file ) {
                global $wgLang;
                return wfMsg( 'svg-long-desc', $file->getWidth(), $file->getHeight(),
                        $wgLang->formatSize( $file->getSize() ) );