From: Roan Kattouw <catrope@users.mediawiki.org>
Date: Thu, 15 Jan 2009 10:26:23 +0000 (+0000)
Subject: Fix regression from r45749: only UTF-8 normalize strings
X-Git-Tag: 1.31.0-rc.0~43407
X-Git-Url: http://git.cyclocoop.org///%22%40url%40//%22?a=commitdiff_plain;h=ef19b747ca282316ef186a1316acef02532ad9ed;p=lhc%2Fweb%2Fwiklou.git

Fix regression from r45749: only UTF-8 normalize strings
---

diff --git a/includes/normal/UtfNormal.php b/includes/normal/UtfNormal.php
index 4f8b12935d..3f08cb476a 100644
--- a/includes/normal/UtfNormal.php
+++ b/includes/normal/UtfNormal.php
@@ -72,6 +72,9 @@ class UtfNormal {
 	 * @return string a clean, shiny, normalized UTF-8 string
 	 */
 	static function cleanUp( $string ) {
+		if( !is_string( $string ) ) {
+			return $string;
+		}
 		if( NORMALIZE_ICU ) {
 			# We exclude a few chars that ICU would not.
 			$string = preg_replace(