From: Niklas Laxström <nikerabbit@users.mediawiki.org>
Date: Wed, 16 Jul 2008 08:48:53 +0000 (+0000)
Subject: * Allow wikitext in file-info, file-info-size, svg-long-desc instead of mix of unesca... 
X-Git-Tag: 1.31.0-rc.0~46484
X-Git-Url: https://git.cyclocoop.org/%242?a=commitdiff_plain;h=5050a139f9d08b46bc033370824585f88faef313;p=lhc%2Fweb%2Fwiklou.git

* Allow wikitext in file-info, file-info-size, svg-long-desc instead of mix of unescaped and plain
* Format numbers in svg-long-desc
---

diff --git a/includes/media/Generic.php b/includes/media/Generic.php
index 101406fffc..b2cb70f66f 100644
--- a/includes/media/Generic.php
+++ b/includes/media/Generic.php
@@ -235,7 +235,9 @@ abstract class MediaHandler {
 	function getLongDesc( $file ) {
 		global $wgUser;
 		$sk = $wgUser->getSkin();
-		return wfMsg( 'file-info', $sk->formatSize( $file->getSize() ), $file->getMimeType() );
+		return wfMsgExt( 'file-info', 'parseinline',
+			$sk->formatSize( $file->getSize() ),
+			$file->getMimeType() );
 	}
 
 	function getDimensionsString( $file ) {
@@ -410,8 +412,11 @@ abstract class ImageHandler extends MediaHandler {
 
 	function getLongDesc( $file ) {
 		global $wgLang;
-		return wfMsgHtml('file-info-size', $wgLang->formatNum( $file->getWidth() ), $wgLang->formatNum( $file->getHeight() ),
-			$wgLang->formatSize( $file->getSize() ), $file->getMimeType() );
+		return wfMsgExt('file-info-size', 'parseinline',
+			$wgLang->formatNum( $file->getWidth() ),
+			$wgLang->formatNum( $file->getHeight() ),
+			$wgLang->formatSize( $file->getSize() ),
+			$file->getMimeType() );
 	}
 
 	function getDimensionsString( $file ) {
diff --git a/includes/media/SVG.php b/includes/media/SVG.php
index 09afe9b28a..2604e3b4e8 100644
--- a/includes/media/SVG.php
+++ b/includes/media/SVG.php
@@ -98,7 +98,9 @@ class SvgHandler extends ImageHandler {
 
 	function getLongDesc( $file ) {
 		global $wgLang;
-		return wfMsg( 'svg-long-desc', $file->getWidth(), $file->getHeight(),
+		return wfMsgExt( 'svg-long-desc', 'parseinline',
+			$wgLang->formatNum( $file->getWidth() ),
+			$wgLang->formatNum( $file->getHeight() ),
 			$wgLang->formatSize( $file->getSize() ) );
 	}
 }