diff options
| author | Nathan Guse <nathaniel.guse@gmail.com> | 2013-10-04 15:04:08 -0500 |
|---|---|---|
| committer | Nathan Guse <nathaniel.guse@gmail.com> | 2013-10-04 15:04:08 -0500 |
| commit | cd7d29b90edcf292464beaf3ab814750703f3f17 (patch) | |
| tree | 75405e3dfa5080e3b1240cb9eaa123863648ff30 /phpBB/phpbb | |
| parent | 9653276ebcd1a5c24302cb8d06f905f90e158e45 (diff) | |
| download | forums-cd7d29b90edcf292464beaf3ab814750703f3f17.tar forums-cd7d29b90edcf292464beaf3ab814750703f3f17.tar.gz forums-cd7d29b90edcf292464beaf3ab814750703f3f17.tar.bz2 forums-cd7d29b90edcf292464beaf3ab814750703f3f17.tar.xz forums-cd7d29b90edcf292464beaf3ab814750703f3f17.zip | |
[ticket/11881] Make sure user_timezone isn't converted twice
PHPBB3-11881
Diffstat (limited to 'phpBB/phpbb')
| -rw-r--r-- | phpBB/phpbb/db/migration/data/v310/timezone.php | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/phpBB/phpbb/db/migration/data/v310/timezone.php b/phpBB/phpbb/db/migration/data/v310/timezone.php index 13e2a5ceb6..6106e179cb 100644 --- a/phpBB/phpbb/db/migration/data/v310/timezone.php +++ b/phpBB/phpbb/db/migration/data/v310/timezone.php @@ -55,7 +55,12 @@ class timezone extends \phpbb\db\migration\migration { $converted++; - $update_blocks[$row['user_timezone'] . ':' . $row['user_dst']][] = (int) $row['user_id']; + // In case this is somehow run twice on a row. + // Otherwise it would just end up as UTC on the second run + if (is_numeric($row['user_timezone'])) + { + $update_blocks[$row['user_timezone'] . ':' . $row['user_dst']][] = (int) $row['user_id']; + } } $this->db->sql_freeresult($result); |