aboutsummaryrefslogtreecommitdiffstats
path: root/phpBB/install/install_convert.php
diff options
context:
space:
mode:
authorMeik Sievertsen <acydburn@phpbb.com>2007-02-25 17:17:19 +0000
committerMeik Sievertsen <acydburn@phpbb.com>2007-02-25 17:17:19 +0000
commit71d2d35c1ee8d339757428e5edcf91a0b8b5c35e (patch)
tree87b0b06020f6e414f5e1dea93667cbe8ade0fa03 /phpBB/install/install_convert.php
parent83059bd4fc81e4d26a199d1b5a72da5dfe83a17d (diff)
downloadforums-71d2d35c1ee8d339757428e5edcf91a0b8b5c35e.tar
forums-71d2d35c1ee8d339757428e5edcf91a0b8b5c35e.tar.gz
forums-71d2d35c1ee8d339757428e5edcf91a0b8b5c35e.tar.bz2
forums-71d2d35c1ee8d339757428e5edcf91a0b8b5c35e.tar.xz
forums-71d2d35c1ee8d339757428e5edcf91a0b8b5c35e.zip
ok, i am not sure if this change is doing what is intended (forcing at least one row to be processed) - please test. :) (i am currently not able to)
git-svn-id: file:///svn/phpbb/trunk@7070 89ea8834-ac86-4346-8a33-228a782c2dd0
Diffstat (limited to 'phpBB/install/install_convert.php')
-rw-r--r--phpBB/install/install_convert.php4
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);