Changeset 8611

Timestamp:

07/12/2014 05:25:27 PM (10 years ago)

Author:

boonebgorges

Message:

More conservative page_template checks in bp_is_current_component()

The page_template checks in bp_is_current_component() should not go through if
the currently queried object is not a single page (ie when a plugin is forcing
it to be a CPT archive). So we check for the presence of the ID property
before attempting to use it.

Fixes #5751

File:

• trunk/src/bp-core/bp-core-template.php (modified) (1 diff)

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

@@ -1107 +1107 @@
     } elseif ( !is_admin() && is_a( $wp_query, 'WP_Query' ) && 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 ( !empty( $page_template ) && strstr( strtolower( $page_template ), strtolower( $component ) ) ) {
-            $is_current_component = true;
+
+        $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;
+            }
         }
     }