From f561d53bdb6e44823627bd086203569883cf457d Mon Sep 17 00:00:00 2001
From: Kohsuke Kawaguchi <kk@kohsuke.org>
Date: Tue, 12 Apr 2011 00:15:30 -0700
Subject: [PATCH] integrated Stapler that handles escaping on i18n exps in a
 new way

---
 core/pom.xml                             | 2 +-
 core/src/main/java/hudson/Functions.java | 8 ++++++++
 2 files changed, 9 insertions(+), 1 deletion(-)

diff --git a/core/pom.xml b/core/pom.xml
index fc430b9e37..786907054d 100644
--- a/core/pom.xml
+++ b/core/pom.xml
@@ -382,7 +382,7 @@ THE SOFTWARE.
     <dependency>
       <groupId>org.kohsuke.stapler</groupId>
       <artifactId>stapler-jelly</artifactId>
-      <version>1.162</version>
+      <version>1.163-SNAPSHOT</version>
       <exclusions>
         <exclusion>
           <groupId>commons-jelly</groupId>
diff --git a/core/src/main/java/hudson/Functions.java b/core/src/main/java/hudson/Functions.java
index 35b8bde113..48a122589d 100644
--- a/core/src/main/java/hudson/Functions.java
+++ b/core/src/main/java/hudson/Functions.java
@@ -84,6 +84,7 @@ import org.kohsuke.stapler.Ancestor;
 import org.kohsuke.stapler.Stapler;
 import org.kohsuke.stapler.StaplerRequest;
 import org.kohsuke.stapler.StaplerResponse;
+import org.kohsuke.stapler.jelly.InternationalizedStringExpression.RawHtmlArgument;
 
 import javax.servlet.ServletException;
 import javax.servlet.http.Cookie;
@@ -1365,4 +1366,11 @@ public class Functions {
         }
         return r;
     }
+
+    /**
+     * Used for arguments to internationalized expressions to avoid escape
+     */
+    public static Object rawHtml(Object o) {
+        return o==null ? null : new RawHtmlArgument(o);
+    }
 }