Changeset 1250 for trunk/bp-core.php

Timestamp:

03/25/2009 04:01:43 PM (15 years ago)

Author:

apeatling

Message:

Removed blogs, groups and members directory from the home theme into the BuddyPress member theme. The directories now have their own templates and theme based CSS and provide much easier editing.

Moved the $bp global setup to a higher priority action - from the 'wp' action to the 'plugins_loaded' action. This stops occurrences where the $bp global was not defined yet.

File:

• trunk/bp-core.php (modified) (7 diffs)

trunk/bp-core.php

@@ -35 +35 @@
 require ( 'bp-core/bp-core-signup.php' );
 require ( 'bp-core/bp-core-activation.php' );
-require ( 'bp-core/directories/bp-core-directory-members.php' );
 
 /* Define the slug for member pages and the members directory (e.g. domain.com/[members] ) */
@@ -75 +74 @@
     global $displayed_user_id;
     global $action_variables;
+    
+    $current_user = wp_get_current_user();
 
     /* The domain for the root of the site where the main blog resides */   
@@ -147 +148 @@
         $bp->current_component = $bp->default_component;
 }
-add_action( 'wp', 'bp_core_setup_globals', 1 );
+add_action( 'plugins_loaded', 'bp_core_setup_globals', 3 );
 add_action( '_admin_menu', 'bp_core_setup_globals', 1 ); // must be _admin_menu hook.
 
@@ -158 +159 @@
     bp_core_add_root_component( HOME_BLOG_SLUG );
 }
-add_action( 'plugins_loaded', 'bp_core_setup_root_components' );
+add_action( 'plugins_loaded', 'bp_core_setup_root_components', 1 );
 
 function bp_core_setup_session() {
@@ -305 +306 @@
 add_action( 'wp', 'bp_core_setup_nav', 2 );
 add_action( 'admin_menu', 'bp_core_setup_nav', 2 );
+
+function bp_core_directory_members() {
+    global $bp;
+    
+    if ( !is_home() && is_null( $bp->displayed_user->id ) && $bp->current_component == $bp->default_component ) {
+        $bp->is_directory = true;
+        $bp->current_component = false;
+
+        wp_enqueue_script( 'bp-core-directory-members', WPMU_PLUGIN_URL . '/bp-core/js/directory-members.js', array( 'jquery', 'jquery-livequery-pack' ) );
+        bp_core_load_template( 'directories/members/index' );
+    }
+}
+add_action( 'wp', 'bp_core_directory_members', 5 );
 
 /**
@@ -1167 +1181 @@
  */
 function bp_core_referrer() {
-    $referer = explode( '/', $_SERVER['HTTP_REFERER'] );
+    $referer = explode( '/', wp_get_referer() );
     unset( $referer[0], $referer[1], $referer[2] );
     return implode( '/', $referer );
@@ -1342 +1356 @@
     global $wpdb;
     ?>
-<!-- Generated in <?php timer_stop(1); ?> seconds. -->
+<!-- Generated in <?php timer_stop(1); ?> seconds. <?php echo $wpdb->num_queries; ?> queries. -->
     <?php
 }