Changeset 4797 for trunk/bp-core/bp-core-functions.php

Timestamp:

07/22/2011 02:29:51 PM (13 years ago)

Author:

boonebgorges

Message:

Check for is_multisite() before checking for Blogs component tables, in case someone has manually disabled MS after having it enabled

File:

• trunk/bp-core/bp-core-functions.php (modified) (1 diff)

trunk/bp-core/bp-core-functions.php

@@ -339 +339 @@
     /**
      * Check to make sure that the blog setup routine has run. This can't happen during the
-     * wizard because of the order which the components are loaded
+     * wizard because of the order which the components are loaded. We check for multisite here
+     * on the off chance that someone has activated the blogs component and then disabled MS
      */
-    if ( bp_is_active( 'blogs' ) ) {
+    if ( is_multisite() && bp_is_active( 'blogs' ) ) {
         $count = $wpdb->get_var( $wpdb->prepare( "SELECT COUNT(*) FROM {$bp->blogs->table_name}" ) );