From 6c8dfa26fa81af2820ad24601d9e4846c9d9b2e1 Mon Sep 17 00:00:00 2001
From: Gabriel Wicke <gwicke@wikimedia.org>
Date: Fri, 29 Jun 2012 23:02:21 +0200
Subject: [PATCH] Escape ampersands in entities from plain text DOM content

Change-Id: I0826077cf48b67e38a525090be66411c38d7b65f
---
 modules/parser/mediawiki.WikitextSerializer.js | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/modules/parser/mediawiki.WikitextSerializer.js b/modules/parser/mediawiki.WikitextSerializer.js
index 2358489f6b..f51c6373bb 100644
--- a/modules/parser/mediawiki.WikitextSerializer.js
+++ b/modules/parser/mediawiki.WikitextSerializer.js
@@ -189,7 +189,9 @@ WSP.escapeWikiText = function ( state, text ) {
 						// push out the original source
 						// XXX: This assumes the content was not
 						// modified for now.
-						outTexts.push( token.dataAttribs.src );
+						outTexts.push( token.dataAttribs.src
+								// escape ampersands in entity text
+								.replace(/&(#?[0-9a-zA-Z]{2,6};)/, '&amp;$1') );
 						// skip generated tokens
 						for ( ; i < l; i ++) {
 							var tk = tokens[i];