From: Niklas Laxström <niklas.laxstrom@gmail.com>
Date: Wed, 29 Aug 2012 20:30:15 +0000 (+0000)
Subject: (bug 39771) Regression in Ie349afa5 broke plurals in JavaScript
X-Git-Tag: 1.31.0-rc.0~22542^2
X-Git-Url: http://git.cyclocoop.org/%24action?a=commitdiff_plain;h=743635cdb3f8d63a09c0e42330f1e15c8bb32e82;p=lhc%2Fweb%2Fwiklou.git

(bug 39771) Regression in Ie349afa5 broke plurals in JavaScript

Change-Id: Iee4e3bdca0e72292d6d431703f0f589653f68f64
---

diff --git a/includes/MessageBlobStore.php b/includes/MessageBlobStore.php
index d112b2530b..34014e1b31 100644
--- a/includes/MessageBlobStore.php
+++ b/includes/MessageBlobStore.php
@@ -299,7 +299,7 @@ class MessageBlobStore {
 	 */
 	private static function reencodeBlob( $blob, $key, $lang ) {
 		$decoded = FormatJson::decode( $blob, true );
-		$decoded[$key] = wfMessage( $key )->inLanguage( $lang )->text();
+		$decoded[$key] = wfMessage( $key )->inLanguage( $lang )->plain();
 
 		return FormatJson::encode( (object)$decoded );
 	}
@@ -353,7 +353,7 @@ class MessageBlobStore {
 		$messages = array();
 
 		foreach ( $module->getMessages() as $key ) {
-			$messages[$key] = wfMessage( $key )->inLanguage( $lang )->text();
+			$messages[$key] = wfMessage( $key )->inLanguage( $lang )->plain();
 		}
 
 		return FormatJson::encode( (object)$messages );