Don't replace ' by &quot; but just ", fixes #557

orbeon · Nov 8, 2012 · 16f1cf3 · 16f1cf3
1 parent 264f509
commit 16f1cf3
Showing 1 changed file with 1 addition and 1 deletion.
diff --git a/src/resources-packaged/ops/javascript/orbeon/util/String.coffee b/src/resources-packaged/ops/javascript/orbeon/util/String.coffee
@@ -37,11 +37,11 @@ ORBEON.util.String = _.tap {}, (StringUtils) -> _.extend StringUtils,
     escapeForMarkup: (text) ->
         # List of characters to replace per http://stackoverflow.com/a/1091953/5295
         characters =
+            '&': '&amp;'        # This replacement needs to come first, so we don't replace the & in the subsequent character entity references
             '"': '&quot;'
             "'": '&apos;'
             '<': '&lt;'
             '>': '&gt;'
-            '&': '&amp;'
         for from, to of characters
             text = StringUtils.replace text, from, to
         text