diff options
| author | Marc Alexander <admin@m-a-styles.de> | 2014-09-17 00:25:25 +0200 |
|---|---|---|
| committer | Marc Alexander <admin@m-a-styles.de> | 2014-09-17 00:25:25 +0200 |
| commit | b82a39fea9c48cb36677ed0aaf2dcb5531848d31 (patch) | |
| tree | a177b9cf4055d93d518a4a0538f6506706a548dc /phpBB | |
| parent | cf71bfbdf25a70ab1fd1cf812bccc8400857cfd4 (diff) | |
| parent | 2e1aebbc12bded1cb311394fe5acb5d8b13124c6 (diff) | |
| download | forums-b82a39fea9c48cb36677ed0aaf2dcb5531848d31.tar forums-b82a39fea9c48cb36677ed0aaf2dcb5531848d31.tar.gz forums-b82a39fea9c48cb36677ed0aaf2dcb5531848d31.tar.bz2 forums-b82a39fea9c48cb36677ed0aaf2dcb5531848d31.tar.xz forums-b82a39fea9c48cb36677ed0aaf2dcb5531848d31.zip | |
Merge branch 'develop-ascraeus' into develop
Diffstat (limited to 'phpBB')
| -rw-r--r-- | phpBB/assets/javascript/core.js | 7 |
1 files changed, 1 insertions, 6 deletions
diff --git a/phpBB/assets/javascript/core.js b/phpBB/assets/javascript/core.js index 5fe78cf052..b5187991f9 100644 --- a/phpBB/assets/javascript/core.js +++ b/phpBB/assets/javascript/core.js @@ -782,12 +782,7 @@ phpbb.timezoneSwitchDate = function(keepSelection) { .insertAfter('#timezone'); } else { // Copy the content of our backup, so we can remove all unneeded options - var $replacement = $timezoneCopy.clone(); - $replacement.attr('id', 'timezone') - .css('display', 'block') - .attr('name', 'tz'); - - $timezone.replaceWith($replacement); + $timezone.html($timezoneCopy.html()); } if ($tzDate.val() !== '') { |