Ticket #805: patch.diff

bp-activity.php

@@ -65 +65 @@
         $bp->activity->table_name = $wpdb->base_prefix . 'bp_activity_user_activity_cached';
         $bp->activity->image_base = BP_PLUGIN_URL . '/bp-activity/images';
         $bp->activity->slug = BP_ACTIVITY_SLUG;
-
-        if ( is_site_admin() && get_site_option( 'bp-activity-db-version' ) < BP_ACTIVITY_DB_VERSION  )
-                bp_activity_install();
 }
 add_action( 'plugins_loaded', 'bp_activity_setup_globals', 5 );
 add_action( 'admin_menu', 'bp_activity_setup_globals', 1 );
@@ -78 +75 @@
 }
 add_action( 'plugins_loaded', 'bp_activity_setup_root_component', 1 );
 
+function bp_activity_check_installed() {        
+        global $wpdb, $bp;
+
+        if ( !is_site_admin() )
+                return false;
+        
+        /* Need to check db tables exist, activate hook no-worky in mu-plugins folder. */
+        if ( get_site_option('bp-activity-db-version') < BP_ACTIVITY_DB_VERSION )
+                bp_activity_install();
+}
+add_action( 'admin_menu', 'bp_activity_check_installed' );
 
 /**************************************************************************
  bp_activity_setup_nav()