diff options
| author | Oleg Pudeyev <oleg@bsdpower.com> | 2012-05-11 02:36:47 -0400 |
|---|---|---|
| committer | Oleg Pudeyev <oleg@bsdpower.com> | 2012-05-11 02:37:25 -0400 |
| commit | 03d3f9adb5d35c27ce58a29c9a0bc229eaf97ca0 (patch) | |
| tree | 3017e1f48f48f9be59515568c63152674d9b1503 /phpBB/styles/subsilver2/template | |
| parent | 61eb0151f0bd9ea5a0f1b229fc80de35a4fac2cf (diff) | |
| parent | 1fcb269616c4241cf93bc8d7db4a202a4e5f79f8 (diff) | |
| download | forums-03d3f9adb5d35c27ce58a29c9a0bc229eaf97ca0.tar forums-03d3f9adb5d35c27ce58a29c9a0bc229eaf97ca0.tar.gz forums-03d3f9adb5d35c27ce58a29c9a0bc229eaf97ca0.tar.bz2 forums-03d3f9adb5d35c27ce58a29c9a0bc229eaf97ca0.tar.xz forums-03d3f9adb5d35c27ce58a29c9a0bc229eaf97ca0.zip | |
Merge PR #785 branch 'develop-olympus' into develop
* develop-olympus:
[ticket/10835] changing "e-mail" to "email"
[ticket/10835] changing CURRENT_CHANGE_PASSWORD_EXPLAIN language entry
[ticket/10835] fixing misleading message in UCP
Conflicts:
phpBB/language/en/ucp.php
Diffstat (limited to 'phpBB/styles/subsilver2/template')
| -rw-r--r-- | phpBB/styles/subsilver2/template/ucp_profile_reg_details.html | 2 |
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 96e2e26683..71b34499d1 100644 --- a/phpBB/styles/subsilver2/template/ucp_profile_reg_details.html +++ b/phpBB/styles/subsilver2/template/ucp_profile_reg_details.html @@ -36,7 +36,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> |