X-Git-Url: http://git.heureux-cyclage.org/?a=blobdiff_plain;f=includes%2FMessageBlobStore.php;h=09561bd78ae7deade64a67de4c6acda99a414f53;hb=31a551d947295b89026f8dd37819bb9b0b58b474;hp=23955aee63a10c564f1fd902774641f3e286feb6;hpb=5e18423043c4e1646e1e500ce8852f6c99d06317;p=lhc%2Fweb%2Fwiklou.git

diff --git a/includes/MessageBlobStore.php b/includes/MessageBlobStore.php
index 23955aee63..09561bd78a 100644
--- a/includes/MessageBlobStore.php
+++ b/includes/MessageBlobStore.php
@@ -140,7 +140,7 @@ class MessageBlobStore {
 		// Save the old and new blobs for later
 		$oldBlob = $row->mr_blob;
 		$newBlob = self::generateMessageBlob( $module, $lang );
-		
+
 		$newRow = array(
 			'mr_resource' => $name,
 			'mr_lang' => $lang,
@@ -299,7 +299,7 @@ class MessageBlobStore {
 	 */
 	private static function reencodeBlob( $blob, $key, $lang ) {
 		$decoded = FormatJson::decode( $blob, true );
-		$decoded[$key] = wfMsgExt( $key, array( 'language' => $lang ) );
+		$decoded[$key] = wfMessage( $key )->inLanguage( $lang )->plain();
 
 		return FormatJson::encode( (object)$decoded );
 	}
@@ -311,6 +311,7 @@ class MessageBlobStore {
 	 * @param $resourceLoader ResourceLoader object
 	 * @param $modules Array of module names
 	 * @param $lang String: language code
+	 * @throws MWException
 	 * @return array Array mapping module names to blobs
 	 */
 	private static function getFromDB( ResourceLoader $resourceLoader, $modules, $lang ) {
@@ -353,7 +354,7 @@ class MessageBlobStore {
 		$messages = array();
 
 		foreach ( $module->getMessages() as $key ) {
-			$messages[$key] = wfMsgExt( $key, array( 'language' => $lang ) );
+			$messages[$key] = wfMessage( $key )->inLanguage( $lang )->plain();
 		}
 
 		return FormatJson::encode( (object)$messages );