Ticket #6940: 6940.01-multisite-check.patch

src/bp-core/admin/bp-core-admin-functions.php

@@ -231 +231 @@
          * 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.
+         *
+         * Do this only on multisite installs.
          */
-        if ( bp_is_active( 'blogs' ) ) {
+        if ( bp_is_active( 'blogs' ) && is_multisite() ) {
                 $bp    = buddypress();
                 $count = $wpdb->get_var( "SELECT COUNT(*) FROM {$bp->blogs->table_name}" );