diff options
| author | Henry Sudhof <kellanved@phpbb.com> | 2007-05-25 09:34:05 +0000 |
|---|---|---|
| committer | Henry Sudhof <kellanved@phpbb.com> | 2007-05-25 09:34:05 +0000 |
| commit | e45c503bde5df9583dde575bec2fe3ff406ac071 (patch) | |
| tree | 05b0228c42e10d6736dcacd134f7eee64cb10e49 /phpBB/install/convertors/functions_phpbb20.php | |
| parent | bd2f26a1862ae7737d830b41adb6f75e7ce1143e (diff) | |
| download | forums-e45c503bde5df9583dde575bec2fe3ff406ac071.tar forums-e45c503bde5df9583dde575bec2fe3ff406ac071.tar.gz forums-e45c503bde5df9583dde575bec2fe3ff406ac071.tar.bz2 forums-e45c503bde5df9583dde575bec2fe3ff406ac071.tar.xz forums-e45c503bde5df9583dde575bec2fe3ff406ac071.zip | |
undoing the fix for #11421 - correcting post counts was not well liked.
#11665
git-svn-id: file:///svn/phpbb/trunk@7674 89ea8834-ac86-4346-8a33-228a782c2dd0
Diffstat (limited to 'phpBB/install/convertors/functions_phpbb20.php')
| -rw-r--r-- | phpBB/install/convertors/functions_phpbb20.php | 17 |
1 files changed, 10 insertions, 7 deletions
diff --git a/phpBB/install/convertors/functions_phpbb20.php b/phpBB/install/convertors/functions_phpbb20.php index badac08999..4346c6f4d1 100644 --- a/phpBB/install/convertors/functions_phpbb20.php +++ b/phpBB/install/convertors/functions_phpbb20.php @@ -59,6 +59,15 @@ function phpbb_insert_forums() $max_forum_id++; + // pruning disabled globally? + $sql = "SELECT config_value + FROM {$convert->src_table_prefix}config + WHERE config_name = 'prune_enable'"; + $result = $src_db->sql_query($sql); + $prune_enabled = (int) $src_db->sql_fetchfield('config_value'); + $src_db->sql_freeresult($result); + + // Insert categories $sql = 'SELECT cat_id, cat_title FROM ' . $convert->src_table_prefix . 'categories @@ -84,13 +93,7 @@ function phpbb_insert_forums() break; } - // pruning disabled globally? - $sql = "SELECT config_value - FROM {$convert->src_table_prefix}config - WHERE config_name = 'prune_enable'"; - $result = $src_db->sql_query($sql); - $prune_enabled = (int) $src_db->sql_fetchfield('config_value'); - $src_db->sql_freeresult($result); + $cats_added = array(); while ($row = $src_db->sql_fetchrow($result)) |