Changeset 948

Timestamp:

01/28/2009 07:56:28 PM (16 years ago)

Author:

apeatling

Message:

Fixes #406

Location:

trunk

Files:

• bp-messages.php (modified) (2 diffs)
• bp-xprofile.php (modified) (2 diffs)

trunk/bp-messages.php

@@ -4 +4 @@
 define ( 'BP_MESSAGES_IS_INSTALLED', 1 );
 define ( 'BP_MESSAGES_VERSION', '1.0b1' );
-define ( 'BP_MESSAGES_DB_VERSION', '937' );
+define ( 'BP_MESSAGES_DB_VERSION', '948' );
 
 include_once( 'bp-messages/bp-messages-classes.php' );
@@ -25 +25 @@
     if ( !empty($wpdb->charset) )
         $charset_collate = "DEFAULT CHARACTER SET $wpdb->charset";
+        
+    // Remove indexes so we can alter the field types for these fields.
+    $wpdb->query( "ALTER TABLE ". $bp['messages']['table_name_threads'] . " DROP INDEX message_ids " );
+    $wpdb->query( "ALTER TABLE ". $bp['messages']['table_name_threads'] . " DROP INDEX sender_ids " );
     
     $sql[] = "CREATE TABLE ". $bp['messages']['table_name_threads'] ." (

trunk/bp-xprofile.php

@@ -4 +4 @@
 /* Set the version number */
 define ( 'BP_XPROFILE_VERSION', '1.0b1' );
-define ( 'BP_XPROFILE_DB_VERSION', '937' );
+define ( 'BP_XPROFILE_DB_VERSION', '948' );
 
 /* Database access classes and functions */
@@ -92 +92 @@
     ) {$charset_collate};";
     
-    $sql[] = "INSERT INTO ". $bp['profile']['table_name_groups'] . " VALUES ( 1, '" . get_site_option( 'bp-xprofile-base-group-name' ) . "', '', 0 );";
-    
-    $sql[] = "INSERT INTO ". $bp['profile']['table_name_fields'] . " ( 
-                id, group_id, parent_id, type, name, description, is_required, field_order, option_order, order_by, is_public, can_delete
-              ) VALUES (
-                1, 1, 0, 'textbox', '" . get_site_option( 'bp-xprofile-fullname-field-name' ) . "', '', 1, 1, 0, '', 1, 0
-              );";
+    if ( get_site_option( 'bp-xprofile-db-version' ) == '' ) {
+        $sql[] = "INSERT INTO ". $bp['profile']['table_name_groups'] . " VALUES ( 1, '" . get_site_option( 'bp-xprofile-base-group-name' ) . "', '', 0 );";
+    
+        $sql[] = "INSERT INTO ". $bp['profile']['table_name_fields'] . " ( 
+                    id, group_id, parent_id, type, name, description, is_required, field_order, option_order, order_by, is_public, can_delete
+                  ) VALUES (
+                    1, 1, 0, 'textbox', '" . get_site_option( 'bp-xprofile-fullname-field-name' ) . "', '', 1, 1, 0, '', 1, 0
+                  );";
+    }
     
     require_once( ABSPATH . 'wp-admin/upgrade-functions.php' );