branch develop updated (5d624c3 -> a064cf7)
This is an automated email from the git hooks/post-receive script. New change to branch develop in repository bow. See http://git.chorem.org/bow.git from 5d624c3 rewrite to prevent XSS rewrite to have correct URL new a064cf7 add author email if login is an email The 1 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "adds" were already present in the repository and have only been added to this reference. Detailed log of new commits: commit a064cf7808ed84779655dfd1ab7551fc79d5a9f6 Author: Benjamin POUSSIN <poussin@codelutin.com> Date: Tue Jul 21 22:07:42 2015 +0200 add author email if login is an email Summary of changes: bow-ui/src/main/webapp/WEB-INF/jsp/atom.jsp | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) -- To stop receiving notification emails like this one, please contact chorem.org SCM administrator <admin+scm@chorem.org>.
This is an automated email from the git hooks/post-receive script. New commit to branch develop in repository bow. See http://git.chorem.org/bow.git commit a064cf7808ed84779655dfd1ab7551fc79d5a9f6 Author: Benjamin POUSSIN <poussin@codelutin.com> Date: Tue Jul 21 22:07:42 2015 +0200 add author email if login is an email --- bow-ui/src/main/webapp/WEB-INF/jsp/atom.jsp | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/bow-ui/src/main/webapp/WEB-INF/jsp/atom.jsp b/bow-ui/src/main/webapp/WEB-INF/jsp/atom.jsp index 656593d..4b03f7b 100644 --- a/bow-ui/src/main/webapp/WEB-INF/jsp/atom.jsp +++ b/bow-ui/src/main/webapp/WEB-INF/jsp/atom.jsp @@ -47,7 +47,10 @@ <updated><fmt:formatDate value="${date}" pattern="yyyy-MM-dd'T'HH:mm:ssXXX" /></updated> <author> - <name>${bowSession.user.login}</name> + <name><s:property value="%{bowSession.user.login}" /></name> + <s:if test="bowSession.user.login.matches('.*@.*\\\\..*')"> + <email><s:property value="%{bowSession.user.login}" /></email> + </s:if> </author> <id>${bowUrl}</id> <s:url var="favicon" value="%{#bowDomain + 'img/favicon.png'}" /> @@ -68,6 +71,9 @@ <updated><fmt:formatDate value="${bookmark.creationDate}" pattern="yyyy-MM-dd'T'HH:mm:ssXXX" /></updated> <author> <name><s:property value="%{#bookmark.getOwner(false).login}" /></name> + <s:if test="#bookmark.getOwner(false).login.matches('.*@.*\\\\..*')"> + <email><s:property value="%{#bookmark.getOwner(false).login}" /></email> + </s:if> </author> <content type="xhtml"> <div xmlns="http://www.w3.org/1999/xhtml"> -- To stop receiving notification emails like this one, please contact chorem.org SCM administrator <admin+scm@chorem.org>.
participants (1)
-
chorem.org scm