From d3cb3afce8a8f3e7bb2bb22130420b9bef0bec61 Mon Sep 17 00:00:00 2001
From: hns <hannesw@gmail.com>
Date: Thu, 16 Oct 2008 13:17:22 +0000
Subject: [PATCH] Fix for bug 625: don't encode & as entity if encountered
 within a tag.

---
 src/helma/util/HtmlEncoder.java | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/src/helma/util/HtmlEncoder.java b/src/helma/util/HtmlEncoder.java
index 56c2af9b..650d6a24 100644
--- a/src/helma/util/HtmlEncoder.java
+++ b/src/helma/util/HtmlEncoder.java
@@ -633,9 +633,12 @@ public final class HtmlEncoder {
                         }
                     }
 
-                    // we didn't reach a break, so encode the ampersand as HTML entity
-                    ret.append("&amp;");
-
+                    // we didn't reach a break, so encode as entity unless inside a tag
+                    if (insideTag) {
+                        ret.append('&');
+                    } else {
+                        ret.append("&amp;");
+                    }
                     break;
 
                 case '\\':