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/prosilver/template/ucp_profile_reg_details.html | |
| 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/prosilver/template/ucp_profile_reg_details.html')
| -rw-r--r-- | phpBB/styles/prosilver/template/ucp_profile_reg_details.html | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/phpBB/styles/prosilver/template/ucp_profile_reg_details.html b/phpBB/styles/prosilver/template/ucp_profile_reg_details.html index 4f74c7193b..5c0639fce7 100644 --- a/phpBB/styles/prosilver/template/ucp_profile_reg_details.html +++ b/phpBB/styles/prosilver/template/ucp_profile_reg_details.html @@ -39,7 +39,7 @@ <fieldset> <dl> - <dt><label for="cur_password">{L_CURRENT_PASSWORD}:</label><br /><span>{L_CURRENT_PASSWORD_EXPLAIN}</span></dt> + <dt><label for="cur_password">{L_CURRENT_PASSWORD}:</label><br /><span><!-- IF S_CHANGE_PASSWORD -->{L_CURRENT_CHANGE_PASSWORD_EXPLAIN}<!-- ELSE -->{L_CURRENT_PASSWORD_EXPLAIN}<!-- ENDIF --></span></dt> <dd><input type="password" name="cur_password" id="cur_password" maxlength="255" value="{CUR_PASSWORD}" class="inputbox" title="{L_CURRENT_PASSWORD}" /></dd> </dl> </fieldset> @@ -48,7 +48,7 @@ </div> <fieldset class="submit-buttons"> - {S_HIDDEN_FIELDS}<input type="reset" value="{L_RESET}" name="reset" class="button2" /> + {S_HIDDEN_FIELDS}<input type="reset" value="{L_RESET}" name="reset" class="button2" /> <input type="submit" name="submit" value="{L_SUBMIT}" class="button1" /> {S_FORM_TOKEN} </fieldset> |