Merge branch 'patch-9' of https://github.com/christopherdarling/silverstripe-framework into christopherdarling-patch-9

This commit is contained in:
Daniel Hensby 2016-03-22 11:13:35 +00:00
commit affb3dba03
1 changed files with 2 additions and 2 deletions

View File

@ -6,6 +6,6 @@
</p>
<p>
<%t ChangePasswordEmail_ss.EMAIL 'Email' %>: $Email<br />
<%t ChangePasswordEmail_ss.PASSWORD 'Password' %>: $CleartextPassword
<%t ChangePasswordEmail_ss.EMAIL 'Email' %>: $Email<% if $CleartextPassword %><br />
<%t ChangePasswordEmail_ss.PASSWORD 'Password' %>: $CleartextPassword<% end_if %>
</p>