Changeset 6583 for trunk/bp-core/admin/bp-core-schema.php

Timestamp:

12/10/2012 08:47:07 AM (12 years ago)

Author:

johnjamesjacoby

Message:

Delete empty update file, deprecate bp_db_update_stuff(), and clean up deprecated phpdoc blocks.

File:

• trunk/bp-core/admin/bp-core-schema.php (modified) (3 diffs)

trunk/bp-core/admin/bp-core-schema.php

@@ -9 +9 @@
     require_once( ABSPATH . 'wp-admin/includes/upgrade.php' );
 
-    /* BuddyPress component DB schema */
-    if ( !empty($wpdb->charset) )
-        return "DEFAULT CHARACTER SET $wpdb->charset";
-
-    return '';
+    // BuddyPress component DB schema
+    return !empty( $wpdb->charset ) ? "DEFAULT CHARACTER SET {$wpdb->charset}" : '';
 }
 
@@ -244 +241 @@
 
     // These values should only be updated if they are not already present
-    if ( !$base_group_name = bp_get_option( 'bp-xprofile-base-group-name' ) ) {
-        bp_update_option( 'bp-xprofile-base-group-name', _x( 'Base', 'First XProfile group name', 'buddypress' ) );
+    if ( ! bp_get_option( 'bp-xprofile-base-group-name' ) ) {
+        bp_update_option( 'bp-xprofile-base-group-name', _x( 'General', 'First field-group name', 'buddypress' ) );
     }
 
-    if ( !$fullname_field_name = bp_get_option( 'bp-xprofile-fullname-field-name' ) ) {
-        bp_update_option( 'bp-xprofile-fullname-field-name', _x( 'Name', 'XProfile fullname field name', 'buddypress' ) );
+    if ( ! bp_get_option( 'bp-xprofile-fullname-field-name' ) ) {
+        bp_update_option( 'bp-xprofile-fullname-field-name', _x( 'Display Name', 'Display name field', 'buddypress' ) );
     }
 
@@ -340 +337 @@
     dbDelta( $sql );
 }
-
-/**
- * I don't appear to be used anymore, but I'm here anyways. I was originally
- * used in olden days to update pre-1.1 schemas, but that was before we had
- * a legitimate update process. Keep me around just incase.
- *
- * @global WPDB $wpdb
- * @global BuddyPress $bp
- */
-function bp_update_db_stuff() {
-    global $wpdb, $bp;
-
-    $bp_prefix = bp_core_get_table_prefix();
-
-    // Rename the old user activity cached table if needed.
-    if ( $wpdb->get_var( "SHOW TABLES LIKE '%{$bp_prefix}bp_activity_user_activity_cached%'" ) )
-        $wpdb->query( "RENAME TABLE {$bp_prefix}bp_activity_user_activity_cached TO {$bp->activity->table_name}" );
-
-    // Rename fields from pre BP 1.2
-    if ( $wpdb->get_var( "SHOW TABLES LIKE '%{$bp->activity->table_name}%'" ) ) {
-        if ( $wpdb->get_var( "SHOW COLUMNS FROM {$bp->activity->table_name} LIKE 'component_action'" ) ) {
-            $wpdb->query( "ALTER TABLE {$bp->activity->table_name} CHANGE component_action type varchar(75) NOT NULL" );
-        }
-
-        if ( $wpdb->get_var( "SHOW COLUMNS FROM {$bp->activity->table_name} LIKE 'component_name'" ) ) {
-            $wpdb->query( "ALTER TABLE {$bp->activity->table_name} CHANGE component_name component varchar(75) NOT NULL" );
-        }
-    }
-
-    // On first installation - record all existing blogs in the system.
-    if ( !(int) $bp->site_options['bp-blogs-first-install'] ) {
-        bp_blogs_record_existing_blogs();
-        bp_update_option( 'bp-blogs-first-install', 1 );
-    }
-
-    if ( is_multisite() ) {
-        bp_core_add_illegal_names();
-    }
-
-    // Update and remove the message threads table if it exists
-    if ( $wpdb->get_var( "SHOW TABLES LIKE '%{$bp_prefix}bp_messages_threads%'" ) ) {
-        if ( BP_Messages_Thread::update_tables() ) {
-            $wpdb->query( "DROP TABLE {$bp_prefix}bp_messages_threads" );
-        }
-    }
-
-}