diff options
| author | Joas Schilling <nickvergessen@gmx.de> | 2014-09-24 14:49:50 +0200 |
|---|---|---|
| committer | Joas Schilling <nickvergessen@gmx.de> | 2014-09-24 14:49:50 +0200 |
| commit | 77ed437b79a2f26a22bcb027fed0e2542a8ed099 (patch) | |
| tree | 03f43e4bc4bd70e3c91572322eda9316f97bb080 /phpBB/assets/javascript/core.js | |
| parent | cb92b4668ec9276fabcf9fad12930228f63f6c19 (diff) | |
| parent | 85bc9b69aebe438ace75aaafc2e04fcf9b08a9d9 (diff) | |
| download | forums-77ed437b79a2f26a22bcb027fed0e2542a8ed099.tar forums-77ed437b79a2f26a22bcb027fed0e2542a8ed099.tar.gz forums-77ed437b79a2f26a22bcb027fed0e2542a8ed099.tar.bz2 forums-77ed437b79a2f26a22bcb027fed0e2542a8ed099.tar.xz forums-77ed437b79a2f26a22bcb027fed0e2542a8ed099.zip | |
Merge branch 'develop-ascraeus' into develop
Conflicts:
phpBB/styles/subsilver2/template/timezone_option.html
Diffstat (limited to 'phpBB/assets/javascript/core.js')
| -rw-r--r-- | phpBB/assets/javascript/core.js | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/phpBB/assets/javascript/core.js b/phpBB/assets/javascript/core.js index b5187991f9..6ddbba7515 100644 --- a/phpBB/assets/javascript/core.js +++ b/phpBB/assets/javascript/core.js @@ -786,7 +786,7 @@ phpbb.timezoneSwitchDate = function(keepSelection) { } if ($tzDate.val() !== '') { - $timezone.children('optgroup').remove(':not([label="' + $('#tz_date').val() + '"])'); + $timezone.children('optgroup').remove(':not([data-tz-value="' + $('#tz_date').val() + '"])'); } if ($tzDate.val() === $tzSelectDateSuggest.attr('data-suggested-tz')) { @@ -795,7 +795,7 @@ phpbb.timezoneSwitchDate = function(keepSelection) { $tzSelectDateSuggest.css('display', 'inline'); } - var $tzOptions = $timezone.children('optgroup[label="' + $tzDate.val() + '"]').children('option'); + var $tzOptions = $timezone.children('optgroup[data-tz-value="' + $tzDate.val() + '"]').children('option'); if ($tzOptions.length === 1) { // If there is only one timezone for the selected date, we just select that automatically. @@ -849,7 +849,7 @@ phpbb.timezonePreselectSelect = function(forceSelector) { minutes = minutes.toString(); } - var prefix = 'GMT' + sign + hours + ':' + minutes; + var prefix = 'UTC' + sign + hours + ':' + minutes; var prefixLength = prefix.length; var selectorOptions = $('option', '#tz_date'); var i; |