From cd7d29b90edcf292464beaf3ab814750703f3f17 Mon Sep 17 00:00:00 2001
From: Nathan Guse <nathaniel.guse@gmail.com>
Date: Fri, 4 Oct 2013 15:04:08 -0500
Subject: [PATCH] [ticket/11881] Make sure user_timezone isn't converted twice

PHPBB3-11881
---
 phpBB/phpbb/db/migration/data/v310/timezone.php | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

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);