Changeset 2742

Timestamp:

02/18/2010 06:50:35 PM (16 years ago)

Author:

apeatling

Message:

Move DB version checks back to checking the DB instead of pre-fetched site options. Fixes #1947

Location:

branches/1.2

Files:

• bp-activity.php (modified) (1 diff)
• bp-blogs.php (modified) (1 diff)
• bp-core.php (modified) (2 diffs)
• bp-friends.php (modified) (1 diff)
• bp-groups.php (modified) (1 diff)
• bp-loader.php (modified) (1 diff)
• bp-messages.php (modified) (1 diff)
• bp-xprofile.php (modified) (1 diff)

branches/1.2/bp-activity.php

@@ -94 +94 @@
         global $wpdb, $bp;
 
-        if ( $bp->site_options['bp-activity-db-version'] < BP_ACTIVITY_DB_VERSION )
+        if ( get_site_option( 'bp-activity-db-version' ) < BP_ACTIVITY_DB_VERSION )
                 bp_activity_install();
 }

branches/1.2/bp-blogs.php

@@ -81 +81 @@
         if ( is_site_admin() && bp_core_is_multisite() ) {
                 /* Need to check db tables exist, activate hook no-worky in mu-plugins folder. */
-                if ( $bp->site_options['bp-blogs-db-version'] < BP_BLOGS_DB_VERSION )
+                if ( get_site_option( 'bp-blogs-db-version' ) < BP_BLOGS_DB_VERSION )
                         bp_blogs_install();
         }

branches/1.2/bp-core.php

@@ -267 +267 @@
 
         /* Need to check db tables exist, activate hook no-worky in mu-plugins folder. */
-        if ( $bp->site_options['bp-core-db-version'] < BP_CORE_DB_VERSION )
+        if ( get_site_option( 'bp-core-db-version' ) < BP_CORE_DB_VERSION )
                 bp_core_install();
 }
@@ -1560 +1560 @@
 
         $options = apply_filters( 'bp_core_site_options', array(
-                'bp-core-db-version',
-                'bp-activity-db-version',
-                'bp-blogs-db-version',
-                'bp-friends-db-version',
-                'bp-groups-db-version',
-                'bp-messages-db-version',
-                'bp-xprofile-db-version',
                 'bp-deactivated-components',
                 'bp-blogs-first-install',

branches/1.2/bp-friends.php

@@ -57 +57 @@
 
         /* Need to check db tables exist, activate hook no-worky in mu-plugins folder. */
-        if ( $bp->site_options['bp-friends-db-version'] < BP_FRIENDS_DB_VERSION )
+        if ( get_site_option( 'bp-friends-db-version' ) < BP_FRIENDS_DB_VERSION )
                 friends_install();
 }

branches/1.2/bp-groups.php

@@ -109 +109 @@
 function groups_check_installed() {
         /* Need to check db tables exist, activate hook no-worky in mu-plugins folder. */
-        if ( $bp->site_options['bp-groups-db-version'] < BP_GROUPS_DB_VERSION )
+        if ( get_site_option( 'bp-groups-db-version' ) < BP_GROUPS_DB_VERSION )
                 groups_install();
 }

branches/1.2/bp-loader.php

@@ -22 +22 @@
 do_action( 'bp_core_loaded' );
 
-/* Activity Streams */
-if ( !isset( $bp_deactivated['bp-activity.php'] ) && file_exists( BP_PLUGIN_DIR . '/bp-activity.php') )
-        include( BP_PLUGIN_DIR . '/bp-activity.php' );
+// /* Activity Streams */
+// if ( !isset( $bp_deactivated['bp-activity.php'] ) && file_exists( BP_PLUGIN_DIR . '/bp-activity.php') )
+//      include( BP_PLUGIN_DIR . '/bp-activity.php' );
 
-/* Blog Tracking */
-if ( !isset( $bp_deactivated['bp-blogs.php'] ) && file_exists( BP_PLUGIN_DIR . '/bp-blogs.php') )
-        include( BP_PLUGIN_DIR . '/bp-blogs.php' );
+// /* Blog Tracking */
+// if ( !isset( $bp_deactivated['bp-blogs.php'] ) && file_exists( BP_PLUGIN_DIR . '/bp-blogs.php') )
+//      include( BP_PLUGIN_DIR . '/bp-blogs.php' );
 
-/* bbPress Forum Integration */
-if ( !isset( $bp_deactivated['bp-forums.php'] ) && file_exists( BP_PLUGIN_DIR . '/bp-forums.php') )
-        include( BP_PLUGIN_DIR . '/bp-forums.php' );
+// /* bbPress Forum Integration */
+// if ( !isset( $bp_deactivated['bp-forums.php'] ) && file_exists( BP_PLUGIN_DIR . '/bp-forums.php') )
+//      include( BP_PLUGIN_DIR . '/bp-forums.php' );
 
-/* Friend Connections */
-if ( !isset( $bp_deactivated['bp-friends.php'] ) && file_exists( BP_PLUGIN_DIR . '/bp-friends.php') )
-        include( BP_PLUGIN_DIR . '/bp-friends.php' );
+// /* Friend Connections */
+// if ( !isset( $bp_deactivated['bp-friends.php'] ) && file_exists( BP_PLUGIN_DIR . '/bp-friends.php') )
+//      include( BP_PLUGIN_DIR . '/bp-friends.php' );
 
 /* Groups Support */

branches/1.2/bp-messages.php

@@ -92 +92 @@
 
         /* Need to check db tables exist, activate hook no-worky in mu-plugins folder. */
-        if ( $bp->site_options['bp-messages-db-version'] < BP_MESSAGES_DB_VERSION )
+        if ( get_site_option( 'bp-messages-db-version' ) < BP_MESSAGES_DB_VERSION )
                 messages_install();
 }

branches/1.2/bp-xprofile.php

@@ -156 +156 @@
 
         /* Need to check db tables exist, activate hook no-worky in mu-plugins folder. */
-        if ( $bp->site_options['bp-xprofile-db-version'] < BP_XPROFILE_DB_VERSION )
+        if ( get_site_option( 'bp-xprofile-db-version' ) < BP_XPROFILE_DB_VERSION )
                 xprofile_install();
 }