Add getGeneralShortDesc() and the like to avoid E_STRICT instead

diff --git a/includes/filerepo/File.php b/includes/filerepo/File.php
index d28fba0..4f0990a 100644 (file)
--- a/includes/filerepo/File.php
+++ b/includes/filerepo/File.php
@@ -1218,7 +1218,7 @@ abstract class File {
                if ( $handler ) {
                        return $handler->getLongDesc( $this );
                } else {
-                       return MediaHandler::getLongDescription( $this );
+                       return MediaHandler::getGeneralLongDesc( $this );
                }
        }
 
@@ -1227,7 +1227,7 @@ abstract class File {
                if ( $handler ) {
                        return $handler->getShortDesc( $this );
                } else {
-                       return MediaHandler::getShortDescription( $this );
+                       return MediaHandler::getGeneralShortDesc( $this );
                }
        }
 

diff --git a/includes/media/Generic.php b/includes/media/Generic.php
index 3e6c944..a9c681e 100644 (file)
--- a/includes/media/Generic.php
+++ b/includes/media/Generic.php
@@ -224,23 +224,30 @@ abstract class MediaHandler {
                        'value' => $value
                );
        }
-       
+
        function getShortDesc( $file ) {
-               return self::getShortDescription( $file );
+               global $wgLang;
+               $nbytes = '(' . wfMsgExt( 'nbytes', array( 'parsemag', 'escape' ),
+                       $wgLang->formatNum( $file->getSize() ) ) . ')';
+               return "$nbytes";
        }
 
        function getLongDesc( $file ) {
-               return self::getLongDescription( $file );
-       }       
-
-       static function getShortDescription( $file ) {
+               global $wgUser;
+               $sk = $wgUser->getSkin();
+               return wfMsgExt( 'file-info', 'parseinline',
+                       $sk->formatSize( $file->getSize() ),
+                       $file->getMimeType() );
+       }
+       
+       static function getGeneralShortDesc( $file ) {
                global $wgLang;
                $nbytes = '(' . wfMsgExt( 'nbytes', array( 'parsemag', 'escape' ),
                        $wgLang->formatNum( $file->getSize() ) ) . ')';
                return "$nbytes";
        }
 
-       static function getLongDescription( $file ) {
+       static function getGeneralLongDesc( $file ) {
                global $wgUser;
                $sk = $wgUser->getSkin();
                return wfMsgExt( 'file-info', 'parseinline',

diff --git a/includes/media/SVG.php b/includes/media/SVG.php
index c7ca213..f0519e8 100644 (file)
--- a/includes/media/SVG.php
+++ b/includes/media/SVG.php
@@ -112,7 +112,7 @@ class SvgHandler extends ImageHandler {
                return array( 'png', 'image/png' );
        }
 
-       static function getLongDescription( $file ) {
+       function getLongDesc( $file ) {
                global $wgLang;
                return wfMsgExt( 'svg-long-desc', 'parseinline',
                        $wgLang->formatNum( $file->getWidth() ),