From: Aaron Schulz <aaron@users.mediawiki.org>
Date: Mon, 15 Dec 2008 21:38:04 +0000 (+0000)
Subject: E_STRICT
X-Git-Tag: 1.31.0-rc.0~43953
X-Git-Url: http://git.cyclocoop.org/data/Fool?a=commitdiff_plain;h=7ae384e254f66026357af1844e90fd744f2ffe21;p=lhc%2Fweb%2Fwiklou.git

E_STRICT
---

diff --git a/includes/filerepo/File.php b/includes/filerepo/File.php
index 9335799766..d28fba04d1 100644
--- 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::getLongDesc( $this );
+			return MediaHandler::getLongDescription( $this );
 		}
 	}
 
@@ -1227,7 +1227,7 @@ abstract class File {
 		if ( $handler ) {
 			return $handler->getShortDesc( $this );
 		} else {
-			return MediaHandler::getShortDesc( $this );
+			return MediaHandler::getShortDescription( $this );
 		}
 	}
 
diff --git a/includes/media/Generic.php b/includes/media/Generic.php
index b2cb70f66f..3e6c944bde 100644
--- a/includes/media/Generic.php
+++ b/includes/media/Generic.php
@@ -224,15 +224,23 @@ abstract class MediaHandler {
 			'value' => $value
 		);
 	}
-
+	
 	function getShortDesc( $file ) {
+		return self::getShortDescription( $file );
+	}
+
+	function getLongDesc( $file ) {
+		return self::getLongDescription( $file );
+	}	
+
+	static function getShortDescription( $file ) {
 		global $wgLang;
 		$nbytes = '(' . wfMsgExt( 'nbytes', array( 'parsemag', 'escape' ),
 			$wgLang->formatNum( $file->getSize() ) ) . ')';
 		return "$nbytes";
 	}
 
-	function getLongDesc( $file ) {
+	static function getLongDescription( $file ) {
 		global $wgUser;
 		$sk = $wgUser->getSkin();
 		return wfMsgExt( 'file-info', 'parseinline',
diff --git a/includes/media/SVG.php b/includes/media/SVG.php
index f0519e8973..c7ca2131a7 100644
--- a/includes/media/SVG.php
+++ b/includes/media/SVG.php
@@ -112,7 +112,7 @@ class SvgHandler extends ImageHandler {
 		return array( 'png', 'image/png' );
 	}
 
-	function getLongDesc( $file ) {
+	static function getLongDescription( $file ) {
 		global $wgLang;
 		return wfMsgExt( 'svg-long-desc', 'parseinline',
 			$wgLang->formatNum( $file->getWidth() ),