From: Max Semenik <maxsem@users.mediawiki.org>
Date: Sat, 19 Mar 2011 15:27:24 +0000 (+0000)
Subject: Fixed message borkage from r78593
X-Git-Tag: 1.31.0-rc.0~31319
X-Git-Url: http://git.cyclocoop.org/%22%2C%20generer_url_ecrire%28?a=commitdiff_plain;h=bb3dca86f388edbde7f2f3def486b415038acb5e;p=lhc%2Fweb%2Fwiklou.git

Fixed message borkage from r78593
---

diff --git a/includes/installer/CliInstaller.php b/includes/installer/CliInstaller.php
index f4b9958a9a..46754a70f0 100644
--- a/includes/installer/CliInstaller.php
+++ b/includes/installer/CliInstaller.php
@@ -122,10 +122,12 @@ class CliInstaller extends Installer {
 		$params = func_get_args();
 		array_shift( $params );
 
+		$text = wfMsgExt( $msg, array( 'parseinline' ), $params );
 		/* parseinline has the nasty side-effect of putting encoded
-		 * angle brackets, around the message, so the substr removes
-		 * them. */
-		$text = substr( wfMsgExt( $msg, array( 'parseinline' ), $params ), 4, -4 );
+		 * angle brackets, around the message.
+		 */
+		$text = preg_replace( '/(^&lt;|&gt;$)/', '', $text );
+
 		$text = preg_replace( '/<a href="(.*?)".*?>(.*?)<\/a>/', '$2 &lt;$1&gt;', $text );
 		echo html_entity_decode( strip_tags( $text ), ENT_QUOTES ) . "\n";
 		flush();