aboutsummaryrefslogtreecommitdiffstats
path: root/phpBB/styles/subsilver2
diff options
context:
space:
mode:
authorOleg Pudeyev <oleg@bsdpower.com>2012-05-11 02:32:58 -0400
committerOleg Pudeyev <oleg@bsdpower.com>2012-05-11 02:32:58 -0400
commit1fcb269616c4241cf93bc8d7db4a202a4e5f79f8 (patch)
treee03612f4773709543536320062c3ed7748a4d54e /phpBB/styles/subsilver2
parent4b3d80729332adbdac5060a1b561615cc35274ac (diff)
parent74e9245df3b6652db10e46302510d27a54db827e (diff)
downloadforums-1fcb269616c4241cf93bc8d7db4a202a4e5f79f8.tar
forums-1fcb269616c4241cf93bc8d7db4a202a4e5f79f8.tar.gz
forums-1fcb269616c4241cf93bc8d7db4a202a4e5f79f8.tar.bz2
forums-1fcb269616c4241cf93bc8d7db4a202a4e5f79f8.tar.xz
forums-1fcb269616c4241cf93bc8d7db4a202a4e5f79f8.zip
Merge PR #785 branch 'Senky/ticket/10835' into develop-olympus
* Senky/ticket/10835: [ticket/10835] changing "e-mail" to "email" [ticket/10835] changing CURRENT_CHANGE_PASSWORD_EXPLAIN language entry [ticket/10835] fixing misleading message in UCP
Diffstat (limited to 'phpBB/styles/subsilver2')
-rw-r--r--phpBB/styles/subsilver2/template/ucp_profile_reg_details.html2
1 files changed, 1 insertions, 1 deletions
diff --git a/phpBB/styles/subsilver2/template/ucp_profile_reg_details.html b/phpBB/styles/subsilver2/template/ucp_profile_reg_details.html
index 78fb5a9628..09f60ad5a7 100644
--- a/phpBB/styles/subsilver2/template/ucp_profile_reg_details.html
+++ b/phpBB/styles/subsilver2/template/ucp_profile_reg_details.html
@@ -42,7 +42,7 @@
<th colspan="2">{L_CONFIRM_CHANGES}</th>
</tr>
<tr>
- <td class="row1" width="35%"><b class="genmed">{L_CURRENT_PASSWORD}: </b><br /><span class="gensmall">{L_CURRENT_PASSWORD_EXPLAIN}</span></td>
+ <td class="row1" width="35%"><b class="genmed">{L_CURRENT_PASSWORD}: </b><br /><span class="gensmall"><!-- IF S_CHANGE_PASSWORD -->{L_CURRENT_CHANGE_PASSWORD_EXPLAIN}<!-- ELSE -->{L_CURRENT_PASSWORD_EXPLAIN}<!-- ENDIF --></span></td>
<td class="row2"><input type="password" class="post" name="cur_password" size="30" maxlength="255" value="{CUR_PASSWORD}" /></td>
</tr>
<tr>