From: Niklas Laxström <nikerabbit@users.mediawiki.org>
Date: Thu, 4 Jun 2009 07:38:00 +0000 (+0000)
Subject: Revert part of r50883, superseded by Tim's r51453
X-Git-Tag: 1.31.0-rc.0~41508
X-Git-Url: http://git.cyclocoop.org/data/%24self?a=commitdiff_plain;h=a03687f4d624c3f78aa331e7dee524c7c8778a58;p=lhc%2Fweb%2Fwiklou.git

Revert part of r50883, superseded by Tim's r51453
---

diff --git a/includes/GlobalFunctions.php b/includes/GlobalFunctions.php
index 41d4a6f29d..4e12e721e2 100644
--- a/includes/GlobalFunctions.php
+++ b/includes/GlobalFunctions.php
@@ -646,8 +646,6 @@ function wfMsgGetKey( $key, $useDB, $langCode = false, $transform = true ) {
 		$message = $wgMessageCache->get( $key, $useDB, $langCode );
 		if ( $transform ) {
 			$message = $wgMessageCache->transform( $message );
-			// Decode two entities used in messages, to allow them "pass" htmlspecialchars
-			$message = str_replace( array( '&#32;', '&nbsp;' ), array( ' ', "\xc2\xa0" ), $message );
 		}
 	} else {
 		$lang = wfGetLangObj( $langCode );
@@ -798,8 +796,6 @@ function wfMsgExt( $key, $options ) {
 			$string = $wgMessageCache->transform( $string,
 				!$forContent,
 				is_object( $langCode ) ? $langCode : null );
-			// Decode two entities used in messages, to allow them "pass" htmlspecialchars
-			$string = str_replace( array( '&#32;', '&nbsp;' ), array( ' ', "\xc2\xa0" ), $string );
 		}
 	}