1 files changed, 2 insertions, 2 deletions
diff --git a/phpBB/install/install_convert.php b/phpBB/install/install_convert.php
index 49ce3689bd..49f21548ca 100644
--- a/phpBB/install/install_convert.php
+++ b/phpBB/install/install_convert.php
@@ -1155,7 +1155,7 @@ class install_convert extends module
 			$counting = -1;
 			$batch_time = 0;
 
-			while (($counting === -1 || $counting >= $convert->batch_size) && still_on_time())
+			while ($counting === -1 || ($counting >= $convert->batch_size && still_on_time()))
 			{
 				$old_current_table = $current_table;
 
@@ -1207,7 +1207,7 @@ class install_convert extends module
 				}
 
 				// Now handle the rows until time is over or no more rows to process...
-				while (still_on_time())
+				while ($counting === 0 || still_on_time())
 				{
 					$convert_row = $src_db->sql_fetchrow($___result);