diff options
| author | Oleg Pudeyev <oleg@bsdpower.com> | 2013-01-02 16:48:46 -0500 |
|---|---|---|
| committer | Oleg Pudeyev <oleg@bsdpower.com> | 2013-01-02 16:48:46 -0500 |
| commit | 56a7dd2bd5bf868bc68d6594d94dd0ae0c4d1531 (patch) | |
| tree | 0b40ff4ea04dbc905689011d1a5e77197a3915b0 /phpBB | |
| parent | 208770d7fddefb7ac46dd63387bc8ab4a2724edd (diff) | |
| parent | e211009eb7f2c595fcc0b64a4f60e2bd08f13303 (diff) | |
| download | forums-56a7dd2bd5bf868bc68d6594d94dd0ae0c4d1531.tar forums-56a7dd2bd5bf868bc68d6594d94dd0ae0c4d1531.tar.gz forums-56a7dd2bd5bf868bc68d6594d94dd0ae0c4d1531.tar.bz2 forums-56a7dd2bd5bf868bc68d6594d94dd0ae0c4d1531.tar.xz forums-56a7dd2bd5bf868bc68d6594d94dd0ae0c4d1531.zip | |
Merge PR #1176 branch 'marc1706/ticket/11302' into develop
# By Marc Alexander
# Via Marc Alexander
* marc1706/ticket/11302:
[ticket/11302] Correctly select first timezone or selected timezone
Diffstat (limited to 'phpBB')
| -rw-r--r-- | phpBB/assets/javascript/core.js | 5 | ||||
| -rw-r--r-- | phpBB/styles/prosilver/template/ucp_register.html | 3 |
2 files changed, 4 insertions, 4 deletions
diff --git a/phpBB/assets/javascript/core.js b/phpBB/assets/javascript/core.js index c18bec7035..a4f7455b01 100644 --- a/phpBB/assets/javascript/core.js +++ b/phpBB/assets/javascript/core.js @@ -438,7 +438,10 @@ phpbb.timezone_switch_date = function(keep_selection) { } if (typeof keep_selection !== 'undefined' && !keep_selection) { - $('#timezone > option:first').attr('selected', true); + var timezoneOptions = $('#timezone > optgroup option'); + if (timezoneOptions.filter(':selected').length <= 0) { + timezoneOptions.filter(':first').attr('selected', true); + } } } diff --git a/phpBB/styles/prosilver/template/ucp_register.html b/phpBB/styles/prosilver/template/ucp_register.html index 47537e9d8b..db95e5ba13 100644 --- a/phpBB/styles/prosilver/template/ucp_register.html +++ b/phpBB/styles/prosilver/template/ucp_register.html @@ -104,7 +104,4 @@ </div> </form> -<script type="text/javascript" src="{T_SUPER_TEMPLATE_PATH}/timezone.js"></script> -<script type="text/javascript">phpbb_preselect_tz_select();</script> - <!-- INCLUDE overall_footer.html --> |