Upgrade fixes

diff --git a/maintenance/archives/patch-userlevels-defaultgroups.sql b/maintenance/archives/patch-userlevels-defaultgroups.sql
index 1b4eca1..0bd2a06 100644 (file)
--- a/maintenance/archives/patch-userlevels-defaultgroups.sql
+++ b/maintenance/archives/patch-userlevels-defaultgroups.sql
@@ -3,8 +3,11 @@
 -- Should probably be inserted when someone create a new database
 --
 
-INSERT INTO `group` VALUES (1,'Anonymous','Anonymous users','read,edit,createaccount');
-INSERT INTO `group` VALUES (2,'Loggedin','General logged in users','read,edit,move,upload');
-INSERT INTO `group` VALUES (3,'Sysops','Operators of this site','read,edit,move,delete,undelete,protect,block,upload,asksql,rollback,patrol,editinterface');
-INSERT INTO `group` VALUES (4,'Bureaucrat','The bureaucrat group is able to make sysops for example. They have no other rights.','read,edit,move,delete,undelete,protect,block,userrights,createaccount,upload,asksql,rollback,patrol,editinterface,siteadmin');
-
+INSERT INTO `group` (group_id,group_name,group_description,group_rights)
+       VALUES (1,'Anonymous','Anonymous users','read,edit,createaccount');
+INSERT INTO `group` (group_id,group_name,group_description,group_rights)
+       VALUES (2,'Loggedin','General logged in users','read,edit,move,upload');
+INSERT INTO `group` (group_id,group_name,group_description,group_rights)
+       VALUES (3,'Sysops','Operators of this site','read,edit,move,delete,undelete,protect,block,upload,asksql,rollback,patrol,editinterface');
+INSERT INTO `group` (group_id,group_name,group_description,group_rights)
+       VALUES (4,'Bureaucrat','The bureaucrat group is able to make sysops for example. They have no other rights.','read,edit,move,delete,undelete,protect,block,userrights,createaccount,upload,asksql,rollback,patrol,editinterface,siteadmin');

diff --git a/maintenance/updaters.inc b/maintenance/updaters.inc
index 8fb599b..4be37c0 100644 (file)
--- a/maintenance/updaters.inc
+++ b/maintenance/updaters.inc
@@ -32,7 +32,8 @@ $wgNewFields = array(
        array( 'recentchanges', 'rc_patrolled',     'patch-rc-patrol.sql' ),
        array( 'user',          'user_real_name',   'patch-user-realname.sql' ),
        array( 'user',          'user_token',       'patch-user_token.sql' ),
-       array( 'user_rights',   'ur_user',           'patch-rename-user_groups-and_rights.sql' ),
+       array( 'user_rights',   'ur_user',          'patch-rename-user_groups-and_rights.sql' ),
+       array( 'group',         'group_rights',     'patch-userlevels-rights.sql' ),
 );
 
 function add_table( $name, $patch ) {
@@ -170,7 +171,7 @@ function do_all_updates() {
 
        # Add missing fields
        foreach ( $wgNewFields as $fieldRecord ) {
-               add_table( $fieldRecord[0], $fieldRecord[1], $fieldRecord[2] );
+               add_field( $fieldRecord[0], $fieldRecord[1], $fieldRecord[2] );
                flush();
        }