Changeset 1705

Timestamp:

08/26/2009 04:21:57 PM (16 years ago)

Author:

apeatling

Message:

Added internal ID's to all components.

Location:

trunk

Files:

• bp-activity.php (modified) (4 diffs)
• bp-blogs.php (modified) (1 diff)
• bp-forums.php (modified) (1 diff)
• bp-friends.php (modified) (1 diff)
• bp-groups.php (modified) (1 diff)
• bp-messages.php (modified) (2 diffs)
• bp-wire.php (modified) (1 diff)

trunk/bp-activity.php

@@ -1 +1 @@
 <?php
 
-define ( 'BP_ACTIVITY_DB_VERSION', '1700' );
+define ( 'BP_ACTIVITY_DB_VERSION', '1721' );
 
 /* Define the slug for the component */
@@ -46 +46 @@
     $wpdb->query( "DROP TABLE IF EXISTS {$wpdb->base_prefix}bp_activity_sitewide" );
     
+    /* Rename the old user activity cached table */
+    $wpdb->query( "RENAME TABLE {$wpdb->base_prefix}bp_activity_user_activity_cached TO {$bp->activity->table_name}" );
+
     update_site_option( 'bp-activity-db-version', BP_ACTIVITY_DB_VERSION );
 }
@@ -52 +55 @@
     global $bp, $wpdb, $current_blog;
 
-    $bp->activity->table_name = $wpdb->base_prefix . 'bp_activity_user_activity_cached';
+    /* Internal identifier */
+    $bp->activity->id = 'activity';
+    
+    $bp->activity->table_name = $wpdb->base_prefix . 'bp_activity';
     $bp->activity->slug = BP_ACTIVITY_SLUG;
-
-    if ( is_site_admin() && get_site_option( 'bp-activity-db-version' ) < BP_ACTIVITY_DB_VERSION  )
+}
+add_action( 'plugins_loaded', 'bp_activity_setup_globals', 5 );
+add_action( 'admin_menu', 'bp_activity_setup_globals', 2 );
+
+function bp_activity_check_installed() {    
+    global $wpdb, $bp;
+    
+//  if ( 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 );
+add_action( 'admin_menu', 'bp_activity_check_installed' );
 
 function bp_activity_setup_root_component() {
@@ -65 +76 @@
     bp_core_add_root_component( BP_ACTIVITY_SLUG );
 }
-add_action( 'plugins_loaded', 'bp_activity_setup_root_component', 1 );
+add_action( 'plugins_loaded', 'bp_activity_setup_root_component', 2 );
 
 function bp_activity_setup_nav() {

trunk/bp-blogs.php

@@ -107 +107 @@
 function bp_blogs_setup_globals() {
     global $bp, $wpdb;
-
+    
+    /* For internal identification */
     $bp->blogs->id = 'blogs';
+    
     $bp->blogs->table_name = $wpdb->base_prefix . 'bp_user_blogs';
     $bp->blogs->table_name_blog_posts = $wpdb->base_prefix . 'bp_user_blogs_posts';

trunk/bp-forums.php

@@ -12 +12 @@
 function bp_forums_setup() {
     global $bp;
-    
+
+    /* For internal identification */
+    $bp->forums->id = 'forums';
+        
     $bp->forums->image_base = BP_PLUGIN_URL . '/bp-forums/images';
     $bp->forums->bbconfig = get_site_option( 'bb-config-location' );

trunk/bp-friends.php

@@ -39 +39 @@
 function friends_setup_globals() {
     global $bp, $wpdb;
-    
+
+    /* For internal identification */
+    $bp->friends->id = 'friends';
+        
     $bp->friends->table_name = $wpdb->base_prefix . 'bp_friends';
     $bp->friends->format_activity_function = 'friends_format_activity';
     $bp->friends->format_notification_function = 'friends_format_notifications';
-
     $bp->friends->slug = BP_FRIENDS_SLUG;
 
-    $bp->version_numbers->friends = BP_FRIENDS_VERSION;
 }
 add_action( 'plugins_loaded', 'friends_setup_globals', 5 ); 

trunk/bp-groups.php

@@ -98 +98 @@
 function groups_setup_globals() {
     global $bp, $wpdb;
-    
+
+    /* For internal identification */
+    $bp->groups->id = 'groups';
+        
     $bp->groups->table_name = $wpdb->base_prefix . 'bp_groups';
     $bp->groups->table_name_members = $wpdb->base_prefix . 'bp_groups_members';

trunk/bp-messages.php

@@ -74 +74 @@
 function messages_setup_globals() {
     global $bp, $wpdb;
+
+    /* For internal identification */
+    $bp->messages->id = 'messages';
     
     $bp->messages->table_name_threads = $wpdb->base_prefix . 'bp_messages_threads';
@@ -81 +84 @@
     $bp->messages->format_activity_function = 'messages_format_activity';
     $bp->messages->format_notification_function = 'messages_format_notifications';
-    $bp->messages->image_base = BP_PLUGIN_URL . '/bp-messages/images';
     $bp->messages->slug = BP_MESSAGES_SLUG;
-
-    $bp->version_numbers->messages = BP_MESSAGES_VERSION;
 }
 add_action( 'plugins_loaded', 'messages_setup_globals', 5 );    

trunk/bp-wire.php

@@ -19 +19 @@
 function bp_wire_setup_globals() {
     global $bp, $wpdb;
+
+    /* For internal identification */
+    $bp->wire->id = 'wire';
     
-    $bp->wire->image_base = BP_PLUGIN_URL . '/bp-wire/images';
     $bp->wire->slug = BP_WIRE_SLUG;
-
-    $bp->version_numbers->wire = BP_WIRE_VERSION;
 }
 add_action( 'plugins_loaded', 'bp_wire_setup_globals', 5 );