Merged r3452 from trunk.
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/branches/0.9-stable@3462 e93f8b46-1217-0410-a6f0-8f06a7374b81
This commit is contained in:
1 parent
40a4b111fa
commit
0b7d4e818a
10 files changed
+21
-21
No files matched your search
@@ -1,10 +1,10 @@
|
||||
<% if @user.auth_source %>
|
||||
<p><%= l(:mail_body_account_information_external, @user.auth_source.name) %></p>
|
||||
<p><%= l(:mail_body_account_information_external, h(@user.auth_source.name)) %></p>
|
||||
<% else %>
|
||||
<p><%= l(:mail_body_account_information) %>:</p>
|
||||
<ul>
|
||||
<li><%= l(:field_login) %>: <%= @user.login %></li>
|
||||
<li><%= l(:field_password) %>: <%= @password %></li>
|
||||
<li><%= l(:field_login) %>: <%=h @user.login %></li>
|
||||
<li><%= l(:field_password) %>: <%=h @password %></li>
|
||||
</ul>
|
||||
<% end %>
|
||||
|
||||
|
||||
Reference in new issue
Block a user