Changeset 4839

Timestamp:

07/24/2011 07:45:09 PM (13 years ago)

Author:

boonebgorges

Message:

Refactors bp_is_blog_page() to use simpler logic, and to avoid reference to unused bp->root_components. Fixes #3375

File:

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

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

@@ -741 +741 @@
 function bp_is_root_component( $component_name ) {
     global $bp;
-
+    
     if ( !isset( $bp->active_components ) )
         return false;
@@ -777 +777 @@
 }
 
+/**
+ * Is this a blog page, ie a non-BP page?
+ *
+ * You can tell if a page is displaying BP content by whether the current_component has been defined
+ *
+ * @package BuddyPress
+ *
+ * @return bool True if it's a non-BP page, false otherwise
+ */
 function bp_is_blog_page() {
     global $bp, $wp_query;
 
-    if ( $wp_query->is_home && !bp_is_directory() )
-        return true;
-
-    if ( !bp_is_user() && !bp_is_single_item() && !bp_is_directory() && !bp_is_root_component( $bp->current_component ) )
-        return true;
-
-    return false;
+    $is_blog_page = false;
+
+    if ( !bp_current_component() )
+        $is_blog_page = true;
+
+    return apply_filters( 'bp_is_blog_page', $is_blog_page );
 }
 
@@ -1214 +1222 @@
  * @package BuddyPress
  * @subpackage Core Template
+ *
+ * @param array $wp_classes The body classes coming from WP
+ * @param array $custom_classes Classes that were passed to get_body_class()
+ * @return array $classes The BP-adjusted body classes
  */
 function bp_the_body_class() {
@@ -1388 +1400 @@
         return apply_filters( 'bp_get_the_body_class', $classes, $bp_classes, $wp_classes, $custom_classes );
     }
-    add_filter( 'body_class', 'bp_get_the_body_class', 10, 2 )
+add_filter( 'body_class', 'bp_get_the_body_class', 10, 2 )
 ?>