From: Brion Vibber <brion@users.mediawiki.org>
Date: Fri, 9 May 2008 18:40:52 +0000 (+0000)
Subject: Wikify some image messages:
X-Git-Tag: 1.31.0-rc.0~47773
X-Git-Url: http://git.cyclocoop.org/%22.%28%24lien.?a=commitdiff_plain;h=c216717f1d5c762b45b1e463d3ceff50d085cfeb;p=lhc%2Fweb%2Fwiklou.git

Wikify some image messages:
* linkstoimage
* nolinkstoimage
* redirectstofile

Two of these were previously raw-HTML paragraphs, and had div classes stuck on them on eg English Wikipedia.

r34507 changed them into plaintext, breaking them.

Since image pages are already swathed with little wiki bits (meta table, other various bits), shouldn't be any harm in making these properly flexible wiki messages.
---

diff --git a/includes/ImagePage.php b/includes/ImagePage.php
index c77c0776cf..400fea9c64 100644
--- a/includes/ImagePage.php
+++ b/includes/ImagePage.php
@@ -537,11 +537,11 @@ EOT
 		);
 
 		if ( 0 == $dbr->numRows( $res ) ) {
-			$wgOut->addHtml( Xml::element('p', null ,wfMsg( "nolinkstoimage" ) )."\n" );
+			$wgOut->addWikiMsg( 'nolinkstoimage' );
 			return;
 		}
-		$wgOut->addHTML( Xml::element('p', null, wfMsg( 'linkstoimage' ) )."\n" );
-		$wgOut->addHTML( Xml::openElement( 'ul' ));
+		$wgOut->addWikiMsg( 'linkstoimage' );
+		$wgOut->addHTML( "<ul>\n" );
 
 		$sk = $wgUser->getSkin();
 		$count = 0;
@@ -559,7 +559,7 @@ EOT
 		
 		// Add a links to [[Special:Whatlinkshere]]
 		if ( $count > $limit )
-			$wgOut->addWikiText( wfMsg( 'morelinkstoimage', $this->mTitle->getPrefixedDBkey() ) );
+			$wgOut->addWikiMsg( 'morelinkstoimage', $this->mTitle->getPrefixedDBkey() );
 	}
 	
 	function imageRedirects() 
@@ -583,7 +583,8 @@ EOT
 		if ( 0 == $dbr->numRows( $res ) ) 
 			return;
 
-		$wgOut->addHTML( '<p>' . wfMsg( 'redirectstofile' ) .  "</p>\n<ul>" );
+		$wgOut->addWikiMsg( 'redirectstofile' );
+		$wgOut->addHTML( "<ul>\n" );
 
 		$sk = $wgUser->getSkin();
 		while ( $row = $dbr->fetchObject( $res ) ) {