diff options
| author | David M <davidmj@users.sourceforge.net> | 2007-02-07 04:02:00 +0000 |
|---|---|---|
| committer | David M <davidmj@users.sourceforge.net> | 2007-02-07 04:02:00 +0000 |
| commit | 0fc55efc7d887a07061b52456bfb01e0bc298d9a (patch) | |
| tree | 4abcf950c5c63eedf3c968d7826ca5a42e940780 /phpBB/install/convertors/functions_phpbb20.php | |
| parent | 333b3515ed1e94dba1593b2eb3f9fb9d5a1f1440 (diff) | |
| download | forums-0fc55efc7d887a07061b52456bfb01e0bc298d9a.tar forums-0fc55efc7d887a07061b52456bfb01e0bc298d9a.tar.gz forums-0fc55efc7d887a07061b52456bfb01e0bc298d9a.tar.bz2 forums-0fc55efc7d887a07061b52456bfb01e0bc298d9a.tar.xz forums-0fc55efc7d887a07061b52456bfb01e0bc298d9a.zip | |
#7698
- small UTF-8 thing
git-svn-id: file:///svn/phpbb/trunk@6971 89ea8834-ac86-4346-8a33-228a782c2dd0
Diffstat (limited to 'phpBB/install/convertors/functions_phpbb20.php')
| -rw-r--r-- | phpBB/install/convertors/functions_phpbb20.php | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/phpBB/install/convertors/functions_phpbb20.php b/phpBB/install/convertors/functions_phpbb20.php index 14d98deed2..7610c4725d 100644 --- a/phpBB/install/convertors/functions_phpbb20.php +++ b/phpBB/install/convertors/functions_phpbb20.php @@ -158,9 +158,9 @@ function phpbb_insert_forums() } // Now insert the forums - $sql = 'SELECT f.*, fp.prune_days, fp.prune_freq FROM ' . $convert->src_table_prefix . 'forums f + $sql = 'SELECT f.forum_id, f.forum_name, f.cat_id, f.forum_desc, f.forum_status, f.prune_enable, f.prune_next, fp.prune_days, fp.prune_freq FROM ' . $convert->src_table_prefix . 'forums f LEFT JOIN ' . $convert->src_table_prefix . 'forum_prune fp ON f.forum_id = fp.forum_id - GROUP BY f.forum_id + GROUP BY f.forum_id, f.forum_name, f.cat_id, f.forum_desc, f.forum_status, f.prune_enable, f.prune_next, f.forum_order, fp.prune_days, fp.prune_freq ORDER BY f.cat_id, f.forum_order'; if ($convert->mysql_convert) |