diff options
| author | Joas Schilling <nickvergessen@gmx.de> | 2012-11-13 16:24:02 +0100 |
|---|---|---|
| committer | Joas Schilling <nickvergessen@gmx.de> | 2012-11-14 02:01:16 +0100 |
| commit | 8fc022033a16b50aa07d06af8dc2a2508f0d94a6 (patch) | |
| tree | 193a83b0072db5b90f0e5033a29a6aae37e7a2b5 /phpBB/install/database_update.php | |
| parent | 6e286218ec51487e036c9dc74876f90f1db9b6d1 (diff) | |
| download | forums-8fc022033a16b50aa07d06af8dc2a2508f0d94a6.tar forums-8fc022033a16b50aa07d06af8dc2a2508f0d94a6.tar.gz forums-8fc022033a16b50aa07d06af8dc2a2508f0d94a6.tar.bz2 forums-8fc022033a16b50aa07d06af8dc2a2508f0d94a6.tar.xz forums-8fc022033a16b50aa07d06af8dc2a2508f0d94a6.zip | |
[ticket/10411] Update schema and fix database update
PHPBB3-10411
Diffstat (limited to 'phpBB/install/database_update.php')
| -rw-r--r-- | phpBB/install/database_update.php | 52 |
1 files changed, 36 insertions, 16 deletions
diff --git a/phpBB/install/database_update.php b/phpBB/install/database_update.php index 27cc4951a9..540b66d030 100644 --- a/phpBB/install/database_update.php +++ b/phpBB/install/database_update.php @@ -1107,11 +1107,18 @@ function database_update_info() 'ext_name' => array('UNIQUE', 'ext_name'), ), ), + TEAMPAGE_TABLE => array( + 'COLUMNS' => array( + 'teampage_id' => array('UINT', NULL, 'auto_increment'), + 'group_id' => array('UINT', 0), + 'teampage_name' => array('VCHAR_UNI:255', ''), + 'teampage_position' => array('UINT', 0), + 'teampage_parent' => array('UINT', 0), + ), + 'PRIMARY_KEY' => 'teampage_id', + ), ), 'add_columns' => array( - GROUPS_TABLE => array( - 'group_teampage' => array('UINT', 0, 'after' => 'group_legend'), - ), PROFILE_FIELDS_TABLE => array( 'field_show_on_pm' => array('BOOL', 0), ), @@ -2381,26 +2388,39 @@ function change_database_data(&$no_updates, $version) set_config('use_system_cron', 0); } - $sql = 'SELECT group_teampage - FROM ' . GROUPS_TABLE . ' - WHERE group_teampage > 0'; + $sql = 'SELECT teampage_id + FROM ' . TEAMPAGE_TABLE; $result = $db->sql_query_limit($sql, 1); - $added_groups_teampage = (bool) $db->sql_fetchfield('group_teampage'); + $added_groups_teampage = (bool) $db->sql_fetchfield('teampage_id'); $db->sql_freeresult($result); if (!$added_groups_teampage) { - $sql = 'UPDATE ' . GROUPS_TABLE . ' - SET group_teampage = 1 + $sql = 'SELECT * + FROM ' . GROUPS_TABLE . ' WHERE group_type = ' . GROUP_SPECIAL . " - AND group_name = 'ADMINISTRATORS'"; - _sql($sql, $errored, $error_ary); + AND (group_name = 'ADMINISTRATORS' + OR group_name = 'GLOBAL_MODERATORS') + ORDER BY group_name ASC"; + $result = $db->sql_query($sql); - $sql = 'UPDATE ' . GROUPS_TABLE . ' - SET group_teampage = 2 - WHERE group_type = ' . GROUP_SPECIAL . " - AND group_name = 'GLOBAL_MODERATORS'"; - _sql($sql, $errored, $error_ary); + $teampage_entries = array(); + while ($row = $db->sql_fetchrow($result)) + { + $teampage_entries[] = array( + 'group_id' => (int) $row['group_id'], + 'teampage_name' => '', + 'teampage_position' => sizeof($teampage_entries) + 1, + 'teampage_parent' => 0, + ); + } + $db->sql_freeresult($result); + + if (sizeof($teampage_entries)) + { + $db->sql_multi_insert(TEAMPAGE_TABLE, $teampage_entries); + } + unset($teampage_entries); } if (!isset($config['legend_sort_groupname'])) |