Author: bleny Date: 2014-07-10 14:47:47 +0200 (Thu, 10 Jul 2014) New Revision: 2144 Url: http://forge.codelutin.com/projects/wao/repository/revisions/2144 Log: fixes #5410 escapeHtml=true when in a title attribute of an html element Modified: trunk/wao-web/src/main/webapp/WEB-INF/content/contacts.jsp trunk/wao-web/src/main/webapp/WEB-INF/content/obsmer/sampling-plan.jsp trunk/wao-web/src/main/webapp/WEB-INF/content/obsvente/sampling-plan.jsp Modified: trunk/wao-web/src/main/webapp/WEB-INF/content/contacts.jsp =================================================================== --- trunk/wao-web/src/main/webapp/WEB-INF/content/contacts.jsp 2014-07-10 09:50:14 UTC (rev 2143) +++ trunk/wao-web/src/main/webapp/WEB-INF/content/contacts.jsp 2014-07-10 12:47:47 UTC (rev 2144) @@ -512,7 +512,7 @@ <s:if test="mammalsCapture"> <img src="<s:url value="/img/hook-22px.png"/>" alt="<s:text name="wao.ui.field.Contact.mammalsCapture"/>" - title="<s:property value="mammalsInfo" escapeHtml="false"/>"/> + title="<s:property value="mammalsInfo" escapeHtml="true"/>"/> </s:if> </td> </s:if> @@ -536,17 +536,17 @@ <s:if test="authenticatedWaoUser.authorizedToViewContactsComments"> <td class="align-center"> <s:if test=" ! comment.empty"> - <i title="<s:property value="comment" escapeHtml="false"/>" class="fa fa-comment"></i> + <i title="<s:property value="comment" escapeHtml="true"/>" class="fa fa-comment"></i> </s:if> </td> <td class="align-center"> <s:if test=" ! commentCoordinator.empty"> - <i title="<s:property value="commentCoordinator" escapeHtml="false"/>" class="fa fa-comment"></i> + <i title="<s:property value="commentCoordinator" escapeHtml="true"/>" class="fa fa-comment"></i> </s:if> </td> <td class="align-center"> <s:if test=" ! commentAdmin.empty"> - <i title="<s:property value="commentAdmin" escapeHtml="false"/>" class="fa fa-comment"></i> + <i title="<s:property value="commentAdmin" escapeHtml="true"/>" class="fa fa-comment"></i> </s:if> </td> </s:if> Modified: trunk/wao-web/src/main/webapp/WEB-INF/content/obsmer/sampling-plan.jsp =================================================================== --- trunk/wao-web/src/main/webapp/WEB-INF/content/obsmer/sampling-plan.jsp 2014-07-10 09:50:14 UTC (rev 2143) +++ trunk/wao-web/src/main/webapp/WEB-INF/content/obsmer/sampling-plan.jsp 2014-07-10 12:47:47 UTC (rev 2144) @@ -438,7 +438,7 @@ </td> <td> <s:if test=" ! comment.empty"> - <i title="<s:property value="comment" escapeHtml="false"/>" class="fa fa-comment"></i> + <i title="<s:property value="comment" escapeHtml="true"/>" class="fa fa-comment"></i> </s:if> </td> Modified: trunk/wao-web/src/main/webapp/WEB-INF/content/obsvente/sampling-plan.jsp =================================================================== --- trunk/wao-web/src/main/webapp/WEB-INF/content/obsvente/sampling-plan.jsp 2014-07-10 09:50:14 UTC (rev 2143) +++ trunk/wao-web/src/main/webapp/WEB-INF/content/obsvente/sampling-plan.jsp 2014-07-10 12:47:47 UTC (rev 2144) @@ -411,7 +411,7 @@ </td> <td> <s:if test=" ! comment.empty"> - <i title="<s:property value="comment" escapeHtml="false"/>" class="fa fa-comment"></i> + <i title="<s:property value="comment" escapeHtml="true"/>" class="fa fa-comment"></i> </s:if> </td>