Changeset 3884

Timestamp:

01/24/2011 10:23:57 AM (15 years ago)

Author:

johnjamesjacoby

Message:

Adjust bp_is_current_component and bp_core_load_template to look for page templates as root_slug's too

Location:

trunk/bp-core

Files:

• bp-core-catchuri.php (modified) (1 diff)
• bp-core-template.php (modified) (1 diff)

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

@@ -235 +235 @@
 
     // Determine if the root object WP page exists for this request (TODO: is there an API function for this?
-    if ( !$page_exists = $wpdb->get_var( $wpdb->prepare( "SELECT ID FROM {$wpdb->posts} WHERE post_name = %s", $bp_unfiltered_uri[$bp_unfiltered_uri_offset] ) ) )
+    if ( !empty( $bp_unfiltered_uri_offset ) && !$page_exists = $wpdb->get_var( $wpdb->prepare( "SELECT ID FROM {$wpdb->posts} WHERE post_name = %s", $bp_unfiltered_uri[$bp_unfiltered_uri_offset] ) ) )
         return false;
 

trunk/bp-core/bp-core-template.php

@@ -670 +670 @@
             }
         }
+
+    // Page template fallback check if $bp->current_component is empty
+    } elseif ( is_page() ) {
+        global $wp_query;
+        $page          = $wp_query->get_queried_object();
+        $custom_fields = get_post_custom_values( '_wp_page_template', $page->ID );
+        $page_template = $custom_fields[0];
+
+        // Component name is in the page template name
+        if ( strstr( strtolower( $page_template ), strtolower( $component ) ) )
+            $is_current_component = true;
     }