Changeset 309 for trunk/bp-core/bp-core-catchuri.php

Timestamp:

09/09/2008 06:52:13 PM (17 years ago)

Author:

apeatling

Message:

Added complete support for existing blog networks. Please see mailing list for complete overview on the new "home base" features.

File:

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

trunk/bp-core/bp-core-catchuri.php

@@ -76 +76 @@
     $action_variables = array_merge( array(), $action_variables );
 
-    /* catch 'blog' */
-    if ( $current_component == 'blog' )
-        bp_catch_uri( 'blog' );
 }
 add_action( 'wp', 'bp_core_set_uri_globals', 0 );
@@ -110 +107 @@
  */
 function bp_core_do_catch_uri() {
-    global $bp_path;
+    global $bp_path, $bp, $wpdb;
 
     $pages = $bp_path;
+    
+    if ( $wpdb->blogid == get_usermeta( $bp['current_userid'], 'home_base' ) ) {
+        if ( !file_exists( TEMPLATEPATH . "/header.php" ) || !file_exists( TEMPLATEPATH . "/footer.php" ) )
+            wp_die( 'Please make sure your BuddyPress enabled theme includes a header.php and footer.php file.');
 
-    if ( is_array( $pages ) ) {
-        foreach( $pages as $page ) {
-            if ( file_exists( TEMPLATEPATH . "/" . $page . ".php" ) ) {
-                require( TEMPLATEPATH . "/" . $page . ".php" ); die;
+        do_action( 'get_header' );
+        load_template( TEMPLATEPATH . "/header.php" );
+    
+        if ( is_array( $pages ) ) {
+            foreach( $pages as $page ) {
+                if ( file_exists( TEMPLATEPATH . "/" . $page . ".php" ) ) {
+                    load_template( TEMPLATEPATH . "/" . $page . ".php" );
+                }
+            }
+        } else {
+            if ( file_exists( TEMPLATEPATH . "/" . $pages . ".php" ) ) {
+                load_template( TEMPLATEPATH . "/" . $pages . ".php" );
+            } else {
+                load_template( TEMPLATEPATH . "/index.php" );
             }
         }
-    } else {
-        if ( file_exists( TEMPLATEPATH . "/" . $pages . ".php" ) ) {
-            require( TEMPLATEPATH . "/" . $pages . ".php" ); die;
-        } else {
-            require( TEMPLATEPATH . "/index.php" ); die;
-        }
+    
+        do_action( 'get_footer' );
+        load_template( TEMPLATEPATH . "/footer.php" );
+        die;
     }
 }