makary/phpbb
1
0
Fork 0
mirror of https://github.com/phpbb/phpbb.git synced 2025-06-12 22:38:52 +00:00
Code Issues Projects Releases Packages Wiki Activity

Merge PR #1176 branch 'marc1706/ticket/11302' into develop

Browse source 
# By Marc Alexander
# Via Marc Alexander
* marc1706/ticket/11302:
  [ticket/11302] Correctly select first timezone or selected timezone
This commit is contained in:
Oleg Pudeyev 2013-01-02 16:48:46 -05:00
commit 56a7dd2bd5
2 changed files with 4 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
phpBB/assets/javascript/core.js
View file

@ -438,7 +438,10 @@ phpbb.timezone_switch_date = function(keep_selection) {
} }
if (typeof keep_selection !== 'undefined' && !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);
}
} }
} }

3
phpBB/styles/prosilver/template/ucp_register.html
View file

@ -104,7 +104,4 @@
</div> </div>
</form> </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 --> <!-- INCLUDE overall_footer.html -->