aboutsummaryrefslogtreecommitdiffstats
path: root/phpBB/includes/functions_convert.php
diff options
context:
space:
mode:
authorNils Adermann <naderman@naderman.de>2013-11-02 07:20:15 -0700
committerNils Adermann <naderman@naderman.de>2013-11-02 07:20:15 -0700
commit158c998216c91d21dd19a14f847bcf20275f5973 (patch)
tree002624a04af2ce899615da63104c0cdae75cc85f /phpBB/includes/functions_convert.php
parent252a2d7991b651ac271f71474cf4aa18ba23fe6b (diff)
parent481d25d885bc2a037d27e80a26ebc17c52ffbdea (diff)
downloadforums-158c998216c91d21dd19a14f847bcf20275f5973.tar
forums-158c998216c91d21dd19a14f847bcf20275f5973.tar.gz
forums-158c998216c91d21dd19a14f847bcf20275f5973.tar.bz2
forums-158c998216c91d21dd19a14f847bcf20275f5973.tar.xz
forums-158c998216c91d21dd19a14f847bcf20275f5973.zip
Merge pull request #1810 from nickvergessen/ticket/11031
Ticket/11031 Bring phpBB2 converter up to speed with 3.1 changes
Diffstat (limited to 'phpBB/includes/functions_convert.php')
-rw-r--r--phpBB/includes/functions_convert.php36
1 files changed, 34 insertions, 2 deletions
diff --git a/phpBB/includes/functions_convert.php b/phpBB/includes/functions_convert.php
index 50acf9323c..3eeecd038d 100644
--- a/phpBB/includes/functions_convert.php
+++ b/phpBB/includes/functions_convert.php
@@ -1719,7 +1719,7 @@ function add_default_groups()
'GUESTS' => array('', 0, 0),
'REGISTERED' => array('', 0, 0),
'REGISTERED_COPPA' => array('', 0, 0),
- 'GLOBAL_MODERATORS' => array('00AA00', 1, 0),
+ 'GLOBAL_MODERATORS' => array('00AA00', 2, 0),
'ADMINISTRATORS' => array('AA0000', 1, 1),
'BOTS' => array('9E8DA7', 0, 0),
'NEWLY_REGISTERED' => array('', 0, 0),
@@ -1748,7 +1748,7 @@ function add_default_groups()
'group_type' => GROUP_SPECIAL,
'group_colour' => (string) $data[0],
'group_legend' => (int) $data[1],
- 'group_founder_manage' => (int) $data[2]
+ 'group_founder_manage' => (int) $data[2],
);
}
@@ -1758,6 +1758,38 @@ function add_default_groups()
}
}
+function add_groups_to_teampage()
+{
+ global $db;
+
+ $teampage_groups = array(
+ 'ADMINISTRATORS' => 1,
+ 'GLOBAL_MODERATORS' => 2,
+ );
+
+ $sql = 'SELECT *
+ FROM ' . GROUPS_TABLE . '
+ WHERE ' . $db->sql_in_set('group_name', array_keys($teampage_groups));
+ $result = $db->sql_query($sql);
+
+ $teampage_ary = array();
+ while ($row = $db->sql_fetchrow($result))
+ {
+ $teampage_ary[] = array(
+ 'group_id' => (int) $row['group_id'],
+ 'teampage_name' => '',
+ 'teampage_position' => (int) $teampage_groups[$row['group_name']],
+ 'teampage_parent' => 0,
+ );
+ }
+ $db->sql_freeresult($result);
+
+ if (sizeof($teampage_ary))
+ {
+ $db->sql_multi_insert(TEAMPAGE_TABLE, $teampage_ary);
+ }
+}
+
/**
* Sync post count. We might need to do this in batches.