Changeset 1250 for trunk/bp-core/bp-core-catchuri.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/bp-core-catchuri.php (modified) (6 diffs)

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

@@ -33 +33 @@
     global $bp;
     
-    $path = apply_filters( 'bp_uri', $_SERVER['REQUEST_URI'] );
-    
+    if ( strpos( $_SERVER['REQUEST_URI'], 'bp-core-ajax-handler.php' ) )
+        $path = bp_core_referrer();
+    else
+        $path = clean_url( $_SERVER['REQUEST_URI'] );
+
+    $path = apply_filters( 'bp_uri', $path );
+
     // Firstly, take GET variables off the URL to avoid problems,
     // they are still registered in the global $_GET variable */
@@ -79 +84 @@
         }
     }
-    
+
     /* Reset the keys by merging with an empty array */
     $bp_uri = array_merge( array(), $bp_uri );
     $bp_unfiltered_uri = $bp_uri;
-
+    
     /* Catch a member page and set the current member ID */
-    if ( $bp_uri[0] == MEMBERS_SLUG && !empty( $bp_uri[1] ) ) {
+    if ( $bp_uri[0] == MEMBERS_SLUG || in_array( 'bp-core-ajax-handler.php', $bp_uri ) ) {
         $is_member_page = true;
         $is_root_component = true;
@@ -106 +111 @@
     }
 
-    /* This is used to determine where the component and action indexes should start */
-    $root_components = $bp->root_components;
-    
     if ( !isset($is_root_component) )
-        $is_root_component = in_array( $bp_uri[0], $root_components );
+        $is_root_component = in_array( $bp_uri[0], $bp->root_components );
 
     if ( 'no' == VHOST && !$is_root_component ) {
@@ -139 +141 @@
     //var_dump($current_component, $current_action, $action_variables);
 }
-add_action( 'wp', 'bp_core_set_uri_globals', 1 );
+add_action( 'plugins_loaded', 'bp_core_set_uri_globals', 3 );
 
 /**
@@ -254 +256 @@
 
 function bp_core_force_buddypress_theme( $template ) {
-    global $current_component, $current_action;
-    global $is_member_page;
-    
-    // The theme filter does not recognize any globals, where as the stylesheet filter does.
-    // We have to set up the globals to use manually.
-    bp_core_set_uri_globals();
-    
-    $member_theme = get_site_option('active-member-theme');
+    global $is_member_page, $bp;
+
+    $member_theme = get_site_option( 'active-member-theme' );
     
     if ( empty( $member_theme ) )
         $member_theme = 'buddypress-member';
     
+    if ( $is_member_page ) {
+
+        add_filter( 'theme_root', 'bp_core_set_member_theme_root' );
+        add_filter( 'theme_root_uri', 'bp_core_set_member_theme_root_uri' );
+
+        return $member_theme;
+    } else {
+        return $template;
+    }
+}
+add_filter( 'template', 'bp_core_force_buddypress_theme', 1, 1 );
+
+function bp_core_force_buddypress_stylesheet( $stylesheet ) {
+    global $is_member_page;
+
+    $member_theme = get_site_option( 'active-member-theme' );
+    
+    if ( empty( $member_theme ) )
+        $member_theme = 'buddypress-member';
+
     if ( $is_member_page ) {
         add_filter( 'theme_root', 'bp_core_set_member_theme_root' );
@@ -272 +289 @@
         return $member_theme;
     } else {
-        return $template;
-    }
-}
-add_filter( 'template', 'bp_core_force_buddypress_theme', 1, 1 );
-
-function bp_core_force_buddypress_stylesheet( $stylesheet ) {
-    global $bp, $is_member_page;
-
-    $member_theme = get_site_option('active-member-theme');
-    
-    if ( empty( $member_theme ) )
-        $member_theme = 'buddypress-member';
-
-    if ( $is_member_page ) {
-        add_filter( 'theme_root', 'bp_core_set_member_theme_root' );
-        add_filter( 'theme_root_uri', 'bp_core_set_member_theme_root_uri' );
-
-        return $member_theme;
-    } else {
         return $stylesheet;
     }