JENKINS-35669   being double escaped in changesets table of jell…

…y html email template
jenkinsci · Jul 31, 2016 · ad60d8e · ad60d8e · daniel-beck · Nov 13, 2018
1 parent 9948267
commit ad60d8e
Showing 1 changed file with 5 additions and 3 deletions.
diff --git a/src/main/resources/hudson/plugins/emailext/templates/html.jelly b/src/main/resources/hudson/plugins/emailext/templates/html.jelly
@@ -1,4 +1,7 @@
 <?jelly escape-by-default='true'?>
+<!DOCTYPE html [
+    <!ENTITY nbsp "&#38;#38;nbsp&#59;">
+]>
 <j:jelly xmlns:j="jelly:core" xmlns:st="jelly:stapler" xmlns:d="jelly:define">
 
 <STYLE>
@@ -18,7 +21,6 @@ TD.test_failed { color:red; }
 TD.console { font-family:Courier New; }
 </STYLE>
 <BODY>
-<j:set var="spc" value="&amp;nbsp;&amp;nbsp;" />
 
 
 <!-- GENERAL INFO -->
@@ -56,14 +58,14 @@ TD.console { font-family:Courier New; }
       <j:set var="hadChanges" value="true" />
       <j:set var="aUser" value="${cs.hudsonUser}"/>
       <TR>
-        <TD colspan="2" class="bg2">${spc}Revision <B>${cs.commitId?:cs.revision?:cs.changeNumber}</B> by
+        <TD colspan="2" class="bg2">&nbsp;&nbsp;Revision <B>${cs.commitId?:cs.revision?:cs.changeNumber}</B> by
           <B>${aUser!=null?aUser.displayName:cs.author.displayName}: </B>
           <B>(${cs.msgAnnotated})</B>
          </TD>
       </TR>
       <j:forEach var="p" items="${cs.affectedFiles}">
         <TR>
-          <TD width="10%">${spc}${p.editType.name}</TD>
+          <TD width="10%">&nbsp;&nbsp;${p.editType.name}</TD>
           <TD>${p.path}</TD>
         </TR>
       </j:forEach>