diff options
| author | Marc Alexander <admin@m-a-styles.de> | 2016-01-08 16:39:33 +0100 |
|---|---|---|
| committer | Marc Alexander <admin@m-a-styles.de> | 2016-01-08 16:39:33 +0100 |
| commit | 0028ed3e956f2d8e418e0cd26be34cff133ef672 (patch) | |
| tree | e16b30e9bca56e17dbd5ab5a59bae5f6636086a1 /phpBB/adm | |
| parent | b6fee9f536f01d85ae8233dd5259992ce6c6e143 (diff) | |
| parent | 2ab7b124193ab87eeca8eef5d0e50eebd37d3336 (diff) | |
| download | forums-0028ed3e956f2d8e418e0cd26be34cff133ef672.tar forums-0028ed3e956f2d8e418e0cd26be34cff133ef672.tar.gz forums-0028ed3e956f2d8e418e0cd26be34cff133ef672.tar.bz2 forums-0028ed3e956f2d8e418e0cd26be34cff133ef672.tar.xz forums-0028ed3e956f2d8e418e0cd26be34cff133ef672.zip | |
Merge branch '3.1.x'
Conflicts:
phpBB/styles/subsilver2/template/ucp_prefs_personal.html
Diffstat (limited to 'phpBB/adm')
| -rw-r--r-- | phpBB/adm/style/acp_users_prefs.html | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/phpBB/adm/style/acp_users_prefs.html b/phpBB/adm/style/acp_users_prefs.html index 14715f59e4..61904adc23 100644 --- a/phpBB/adm/style/acp_users_prefs.html +++ b/phpBB/adm/style/acp_users_prefs.html @@ -52,7 +52,7 @@ <dl> <dt><label for="dateoptions">{L_BOARD_DATE_FORMAT}{L_COLON}</label><br /><span>{L_BOARD_DATE_FORMAT_EXPLAIN}</span></dt> <dd><select name="dateoptions" id="dateoptions" onchange="if(this.value=='custom'){phpbb.toggleDisplay('custom_date',1);}else{phpbb.toggleDisplay('custom_date',-1);} if (this.value == 'custom') { document.getElementById('dateformat').value = default_dateformat; } else { document.getElementById('dateformat').value = this.value; }">{S_DATEFORMAT_OPTIONS}</select></dd> - <dd><div id="custom_date"<!-- IF not S_CUSTOM_DATEFORMAT --> style="display:none;"<!-- ENDIF -->><input type="text" name="dateformat" id="dateformat" value="{DATE_FORMAT}" maxlength="30" /></div></dd> + <dd><div id="custom_date"<!-- IF not S_CUSTOM_DATEFORMAT --> style="display:none;"<!-- ENDIF -->><input type="text" name="dateformat" id="dateformat" value="{DATE_FORMAT}" maxlength="64" /></div></dd> </dl> <!-- EVENT acp_users_prefs_personal_append --> </fieldset> |