Changeset 518 for trunk/bp-groups.php

Timestamp:

11/08/2008 12:50:13 PM (18 years ago)

Author:

apeatling

Message:

Updating DB tables to support UTF8 charset.

File:

• trunk/bp-groups.php (modified) (5 diffs)

trunk/bp-groups.php

@@ -3 +3 @@
 
 define ( 'BP_GROUPS_IS_INSTALLED', 1 );
-define ( 'BP_GROUPS_VERSION', '0.2.1' );
+define ( 'BP_GROUPS_VERSION', '0.2.3' );
 
 include_once( 'bp-groups/bp-groups-classes.php' );
@@ -22 +22 @@
         global $wpdb, $bp;
         
+        if ( !empty($wpdb->charset) )
+                $charset_collate = "DEFAULT CHARACTER SET $wpdb->charset";
+        
         $sql[] = "CREATE TABLE ". $bp['groups']['table_name'] ." (
-                        id int(11) NOT NULL AUTO_INCREMENT,
+                        id int(11) NOT NULL AUTO_INCREMENT PRIMARY KEY,
                         creator_id int(11) NOT NULL,
                         name varchar(100) NOT NULL,
@@ -38 +41 @@
                         avatar_thumb varchar(150) NOT NULL,
                         avatar_full varchar(150) NOT NULL,
-                PRIMARY KEY id (id),
                     KEY creator_id (creator_id),
                     KEY status (status),
                     KEY is_invitation_only (is_invitation_only)
-                   );";
+                   ) {$charset_collate};";
         
         $sql[] = "CREATE TABLE ". $bp['groups']['table_name_members'] ." (
-                        id int(11) NOT NULL AUTO_INCREMENT,
+                        id int(11) NOT NULL AUTO_INCREMENT PRIMARY KEY,
                         group_id int(11) NOT NULL,
                         user_id int(11) NOT NULL,
@@ -54 +56 @@
                         comments longtext NOT NULL,
                         is_confirmed tinyint(1) NOT NULL DEFAULT '0',
-                        PRIMARY KEY  (id),
                         KEY group_id (group_id),
                         KEY user_id (user_id),
                         KEY inviter_id (inviter_id),
                         KEY is_confirmed (is_confirmed)
-                   );";
+                   ) {$charset_collate};";
 
         $sql[] = "CREATE TABLE ". $bp['groups']['table_name_groupmeta'] ." (
-                        id int(11) NOT NULL AUTO_INCREMENT,
+                        id int(11) NOT NULL AUTO_INCREMENT PRIMARY KEY,
                         group_id int(11) NOT NULL,
                         meta_key varchar(255) DEFAULT NULL,
                         meta_value longtext DEFAULT NULL,
-                        PRIMARY KEY (id),
                         KEY group_id (group_id),
                         KEY meta_key (meta_key)
-                   );";
+                   ) {$charset_collate};";
         
         if ( function_exists('bp_wire_install') ) {
                 $sql[] = "CREATE TABLE ". $bp['groups']['table_name_wire'] ." (
-                                id int(11) NOT NULL AUTO_INCREMENT,
+                                id int(11) NOT NULL AUTO_INCREMENT PRIMARY KEY,
                                 item_id int(11) NOT NULL,
                                 user_id int(11) NOT NULL,
                                 content longtext NOT NULL,
                                 date_posted datetime NOT NULL,
-                                PRIMARY KEY id (id),
                                 KEY item_id (item_id),
                                 KEY user_id (user_id)
-                           );";         
+                           ) {$charset_collate};";              
         }
         
         require_once(ABSPATH . 'wp-admin/upgrade-functions.php');
         dbDelta($sql);
+        
+        // dbDelta won't change character sets, so we need to do this seperately.
+        // This will only be in here pre v1.0
+        $wpdb->query( $wpdb->prepare( "ALTER TABLE " . $bp['groups']['table_name'] . " DEFAULT CHARACTER SET %s", $wpdb->charset ) );
+        $wpdb->query( $wpdb->prepare( "ALTER TABLE " . $bp['groups']['table_name_members'] . " DEFAULT CHARACTER SET %s", $wpdb->charset ) );
+        $wpdb->query( $wpdb->prepare( "ALTER TABLE " . $bp['groups']['table_name_groupmeta'] . " DEFAULT CHARACTER SET %s", $wpdb->charset ) );
+        
+        if ( function_exists('bp_wire_install') )
+                $wpdb->query( $wpdb->prepare( "ALTER TABLE " . $bp['groups']['table_name_wire'] . " DEFAULT CHARACTER SET %s", $wpdb->charset ) );              
         
         add_site_option( 'bp-groups-version', BP_GROUPS_VERSION );
@@ -466 +474 @@
                                 bp_core_add_message( __( 'Your membership request was sent to the group administrator successfully. You will be notified when the group administrator responds to your request.', 'buddypress' ) );
                         }
+                        wp_redirect( bp_group_permalink( $group_obj, false ) );
                 }
                 bp_catch_uri( 'groups/request-membership' );