Changeset 8068

Timestamp:

03/06/2014 07:50:21 PM (9 years ago)

Author:

djpaul

Message:

Core: merge custom body classes with WordPress' defaults.

Until 1.9, we overrode all the custom body classes that are added to the theme, and replaced them with BuddyPress-specific classes.
With 1.9 in r7663, we manually added a couple of WordPress core classes back to fix compatibility problems with certain themes (notably, Twenty Fourteen). However, body classes added by other plugins were still removed.

This change merges BuddyPress' body classes into those provided by WordPress core, and those from any other plugins.

Fixes #4929 and #5204

File:

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

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

@@ -2348 +2348 @@
             $bp_classes[] = 'groups-activity';
 
-        if ( is_user_logged_in() )
-            $bp_classes[] = 'logged-in';
-
         /** Messages **********************************************************/
 
@@ -2422 +2419 @@
         }
 
-        /** is_buddypress *****************************************************/
+        /** Clean up ***********************************************************/
 
         // Add BuddyPress class if we are within a BuddyPress page
@@ -2429 +2426 @@
         }
 
-        /** Clean up***********************************************************/
-
-        // We don't want WordPress blog classes to appear on non-blog pages.
-        if ( !bp_is_blog_page() ) {
-
-            // Observe WP custom background body class
-            if ( in_array( 'custom-background', (array) $wp_classes ) )
-                $bp_classes[] = 'custom-background';
-
-            // Observe WP admin bar body classes
-            if ( in_array( 'admin-bar', (array) $wp_classes ) )
-                $bp_classes[] = 'admin-bar';
-            if ( in_array( 'no-customize-support', (array) $wp_classes ) )
-                $bp_classes[] = 'no-customize-support';
-
-            // Preserve any custom classes already set
-            if ( !empty( $custom_classes ) ) {
-                $wp_classes = (array) $custom_classes;
-            } else {
-                $wp_classes = array();
-            }
-        }
-
-        // Merge WP classes with BP classes and remove any duplicates
+        // Merge WP classes with BuddyPress classes and remove any duplicates
         $classes = array_unique( array_merge( (array) $bp_classes, (array) $wp_classes ) );