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. org.kohsuke.stapler stapler-jelly - 1.162 + 1.163-SNAPSHOT commons-jelly 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); + } }