Ticket #987: bp_get_the_body_class-fix.3.patch

bp-core/bp-core-templatetags.php

@@ -1583 +1583 @@
 function bp_the_body_class() {
         echo bp_get_the_body_class();
 }
-        function bp_get_the_body_class( $wp_classes ) {
+        function bp_get_the_body_class( $wp_classes, $class ) {
                 if ( bp_is_blog_page() || bp_is_activation_page() || bp_is_register_page() )
                         $bp_classes[] = 'blog-page';
                         
@@ -1715 +1715 @@
 
                 if ( is_year() )                
                         $bp_classes[] = 'blog-year';
-                
+
                 /* We don't want WordPress blog classes to appear on non-blog pages. */
-                if ( !bp_is_blog_page() ) 
+                if ( !bp_is_blog_page() ) {
                         $wp_classes = array();
-                
+
+                        /* From wp-includes/post-template.php function get_body_class; preserves user-added class(es). */
+                        if ( !empty( $class ) ) {
+                                if ( !is_array( $class ) )
+                                        $class = preg_split( '#\s+#', $class );
+                                $wp_classes = $class;
+                        }
+                }
+
                 return apply_filters( 'bp_get_the_body_class', array_merge( (array) $bp_classes, (array) $wp_classes ), $bp_classes, $wp_classes );
         }
-        add_filter( 'body_class', 'bp_get_the_body_class' )
+        add_filter( 'body_class', 'bp_get_the_body_class', 0, 2 )
 
 
 ?>
+ No newline at end of file