From: Neil Kandalgaonkar <neilk@users.mediawiki.org>
Date: Tue, 24 Jan 2012 04:23:02 +0000 (+0000)
Subject: do not try to html-escape anything but strings; fixes failing unit tests
X-Git-Tag: 1.31.0-rc.0~25104
X-Git-Url: http://git.cyclocoop.org/data/Luca_Pacioli_%28Gemaelde%29.jpeg?a=commitdiff_plain;h=0ea5a015663654db9338c15f135a35de36929e76;p=lhc%2Fweb%2Fwiklou.git

do not try to html-escape anything but strings; fixes failing unit tests
---

diff --git a/resources/mediawiki/mediawiki.jqueryMsg.js b/resources/mediawiki/mediawiki.jqueryMsg.js
index bf597c87d2..6c00bd15a1 100644
--- a/resources/mediawiki/mediawiki.jqueryMsg.js
+++ b/resources/mediawiki/mediawiki.jqueryMsg.js
@@ -28,7 +28,7 @@
 			var key = args[0];
 			var argsArray = $.isArray( args[1] ) ? args[1] : $.makeArray( args ).slice( 1 ); 
 			var escapedArgsArray = $.map( argsArray, function( arg ) { 
-				return arg instanceof jQuery ? arg : mw.html.escape( arg );
+				return typeof arg === 'string' ? mw.html.escape( arg ) : arg;
 			} );
 			try {
 				return parser.parse( key, escapedArgsArray );