Changeset 9091 for trunk/src/bp-core/bp-core-template.php

Timestamp:

10/26/2014 06:42:40 PM (10 years ago)

Author:

johnjamesjacoby

Message:

Remove page template name check in bp_is_current_component() introduced in r3884, fixing potential collisions causing unexpected template output or redirections.

Props pro120. Fixes #5721.

File:

• trunk/src/bp-core/bp-core-template.php (modified) (3 diffs)

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

@@ -1082 +1082 @@
  * @return bool Returns true if the component matches, or else false.
  */
-function bp_is_current_component( $component ) {
-    global $wp_query;
-
+function bp_is_current_component( $component = '' ) {
+
+    // Default is no match. We'll check a few places for matches
     $is_current_component = false;
 
@@ -1099 +1099 @@
     $bp = buddypress();
 
+    // Only check if BuddyPress found a current_component
     if ( ! empty( $bp->current_component ) ) {
 
@@ -1137 +1138 @@
                     break;
                 }
-            }
-        }
-
-    // Page template fallback check if $bp->current_component is empty
-    } elseif ( !is_admin() && is_a( $wp_query, 'WP_Query' ) && is_page() ) {
-        global $wp_query;
-
-        $page = $wp_query->get_queried_object();
-        if ( isset( $page->ID ) ) {
-            $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 ( !empty( $page_template ) && strstr( strtolower( $page_template ), strtolower( $component ) ) ) {
-                $is_current_component = true;
             }
         }