Revert r33911 for now -- causes fatal error death with OggHandler at least.

[lhc/web/wiklou.git] / includes / media / Generic.php

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() );