Merge branch 'origin/pr/1244'

This commit is contained in:
Evan Harris
2019-10-02 01:24:51 -05:00
@@ -132,7 +132,7 @@
</td> </td>
<td style="padding-left:15pt;padding-right:5pt;vertical-align: middle;width: 100%;text-align: center"> <td style="padding-left:15pt;padding-right:5pt;vertical-align: middle;width: 100%;text-align: center">
<a href="<c:url value="/logout"/>" target="_top">
<c:choose> <c:choose>
<c:when test="${model.showAvatar}"> <c:when test="${model.showAvatar}">
<sub:url value="avatar.view" var="avatarUrl"> <sub:url value="avatar.view" var="avatarUrl">
@@ -152,8 +152,9 @@
<div class="detail"> <div class="detail">
<fmt:message key="top.logout" var="logout"><br/> <fmt:message key="top.logout" var="logout"><br/>
<fmt:param value="${model.user.username}"/></fmt:message> <fmt:param value="${model.user.username}"/></fmt:message>
<a href="<c:url value="/logout"/>" target="_top">${fn:escapeXml(logout)}</a> ${fn:escapeXml(logout)}
</div> </div>
</a>
</td> </td>
</tr></table> </tr></table>