aboutsummaryrefslogtreecommitdiffstats
path: root/phpBB/install/convertors/convert_phpbb20.php
diff options
context:
space:
mode:
authorJoas Schilling <nickvergessen@gmx.de>2013-11-02 12:49:28 +0100
committerJoas Schilling <nickvergessen@gmx.de>2013-11-02 13:25:46 +0100
commitcb8cd50495eb9d75cae8e7f1450033acfdb0b374 (patch)
tree22bc1832b3818e6335a71b4414fad223bb4bcc35 /phpBB/install/convertors/convert_phpbb20.php
parent85a12ce4f412fb307e6d23706936e493b8bc7b3d (diff)
downloadforums-cb8cd50495eb9d75cae8e7f1450033acfdb0b374.tar
forums-cb8cd50495eb9d75cae8e7f1450033acfdb0b374.tar.gz
forums-cb8cd50495eb9d75cae8e7f1450033acfdb0b374.tar.bz2
forums-cb8cd50495eb9d75cae8e7f1450033acfdb0b374.tar.xz
forums-cb8cd50495eb9d75cae8e7f1450033acfdb0b374.zip
[ticket/11031] Correctly add groups to teampage
PHPBB3-11031
Diffstat (limited to 'phpBB/install/convertors/convert_phpbb20.php')
-rw-r--r--phpBB/install/convertors/convert_phpbb20.php6
1 files changed, 5 insertions, 1 deletions
diff --git a/phpBB/install/convertors/convert_phpbb20.php b/phpBB/install/convertors/convert_phpbb20.php
index 9d59e7a6c9..13d2ed9bd4 100644
--- a/phpBB/install/convertors/convert_phpbb20.php
+++ b/phpBB/install/convertors/convert_phpbb20.php
@@ -828,7 +828,10 @@ if (!$get_info)
array(
'target' => GROUPS_TABLE,
'autoincrement' => 'group_id',
- 'query_first' => array('target', $convert->truncate_statement . GROUPS_TABLE),
+ 'query_first' => array(
+ array('target', $convert->truncate_statement . GROUPS_TABLE),
+ array('target', $convert->truncate_statement . TEAMPAGE_TABLE),
+ ),
array('group_id', 'groups.group_id', ''),
array('group_type', 'groups.group_type', 'phpbb_convert_group_type'),
@@ -845,6 +848,7 @@ if (!$get_info)
'query_first' => array('target', $convert->truncate_statement . USER_GROUP_TABLE),
'execute_first' => '
add_default_groups();
+ add_groups_to_teampage();
',
array('group_id', 'groups.group_id', ''),