From: Brian Wolff <bawolff+wn@gmail.com>
Date: Sat, 24 May 2014 19:58:43 +0000 (-0300)
Subject: Reduce some code duplication
X-Git-Tag: 1.31.0-rc.0~15531^2
X-Git-Url: http://git.cyclocoop.org/%22%20.%20generer_url_ecrire%28%22auteur_infos%22%2C%20%22id_auteur=%24id%22%29%20.%20%22?a=commitdiff_plain;h=d6b6f54caf0704fa55f33f03864d7b4fb705f055;p=lhc%2Fweb%2Fwiklou.git

Reduce some code duplication

MediaHandler::getLongDesc and getGeneralLongDesc have same
implementation, so forward one method to the other. Same for
short.

Also get rid of one unnecessary $wgLang global usage.

Change-Id: I688e27ce2b9cf950defa16ec6bce2e52c5959b03
---

diff --git a/includes/media/MediaHandler.php b/includes/media/MediaHandler.php
index ab8fa14feb..52dbf9711d 100644
--- a/includes/media/MediaHandler.php
+++ b/includes/media/MediaHandler.php
@@ -579,9 +579,7 @@ abstract class MediaHandler {
 	 * @return string
 	 */
 	function getShortDesc( $file ) {
-		global $wgLang;
-
-		return htmlspecialchars( $wgLang->formatSize( $file->getSize() ) );
+		return self::getGeneralShortDesc( $file );
 	}
 
 	/**
@@ -591,10 +589,7 @@ abstract class MediaHandler {
 	 * @return string
 	 */
 	function getLongDesc( $file ) {
-		global $wgLang;
-
-		return wfMessage( 'file-info', htmlspecialchars( $wgLang->formatSize( $file->getSize() ) ),
-			$file->getMimeType() )->parse();
+		return self::getGeneralLongDesc( $file );
 	}
 
 	/**
@@ -606,7 +601,7 @@ abstract class MediaHandler {
 	static function getGeneralShortDesc( $file ) {
 		global $wgLang;
 
-		return $wgLang->formatSize( $file->getSize() );
+		return htmlspecialchars( $wgLang->formatSize( $file->getSize() ) );
 	}
 
 	/**
@@ -616,10 +611,8 @@ abstract class MediaHandler {
 	 * @return string
 	 */
 	static function getGeneralLongDesc( $file ) {
-		global $wgLang;
-
-		return wfMessage( 'file-info', $wgLang->formatSize( $file->getSize() ),
-			$file->getMimeType() )->parse();
+		return wfMessage( 'file-info' )->sizeParams( $file->getSize() )
+			->params( $file->getMimeType() )->parse();
 	}
 
 	/**