<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head><meta http-equiv="content-type" content="text/html; charset=utf-8" />
<title>[BuddyPress][8068] trunk/bp-core/bp-core-template.php: Core: merge custom body classes with WordPress' defaults.</title>
</head>
<body>
<style type="text/css"><!--
#msg dl.meta { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dl.meta dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer, #logmsg { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; }
#msg dl a { font-weight: bold}
#msg dl a:link { color:#fc3; }
#msg dl a:active { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre { overflow: auto; background: #ffc; border: 1px #fa0 solid; padding: 6px; }
#logmsg { background: #ffc; border: 1px #fa0 solid; padding: 1em 1em 0 1em; }
#logmsg p, #logmsg pre, #logmsg blockquote { margin: 0 0 1em 0; }
#logmsg p, #logmsg li, #logmsg dt, #logmsg dd { line-height: 14pt; }
#logmsg h1, #logmsg h2, #logmsg h3, #logmsg h4, #logmsg h5, #logmsg h6 { margin: .5em 0; }
#logmsg h1:first-child, #logmsg h2:first-child, #logmsg h3:first-child, #logmsg h4:first-child, #logmsg h5:first-child, #logmsg h6:first-child { margin-top: 0; }
#logmsg ul, #logmsg ol { padding: 0; list-style-position: inside; margin: 0 0 0 1em; }
#logmsg ul { text-indent: -1em; padding-left: 1em; }#logmsg ol { text-indent: -1.5em; padding-left: 1.5em; }
#logmsg > ul, #logmsg > ol { margin: 0 0 1em 0; }
#logmsg pre { background: #eee; padding: 1em; }
#logmsg blockquote { border: 1px solid #fa0; border-left-width: 10px; padding: 1em 1em 0 1em; background: white;}
#logmsg dl { margin: 0; }
#logmsg dt { font-weight: bold; }
#logmsg dd { margin: 0; padding: 0 0 0.5em 0; }
#logmsg dd:before { content:'\00bb';}
#logmsg table { border-spacing: 0px; border-collapse: collapse; border-top: 4px solid #fa0; border-bottom: 1px solid #fa0; background: #fff; }
#logmsg table th { text-align: left; font-weight: normal; padding: 0.2em 0.5em; border-top: 1px dotted #fa0; }
#logmsg table td { text-align: right; border-top: 1px dotted #fa0; padding: 0.2em 0.5em; }
#logmsg table thead th { text-align: center; border-bottom: 1px solid #fa0; }
#logmsg table th.Corner { text-align: left; }
#logmsg hr { border: none 0; border-top: 2px dashed #fa0; height: 1px; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<div id="msg">
<dl class="meta">
<dt>Revision</dt> <dd><a href="http://buddypress.trac.wordpress.org/changeset/8068">8068</a></dd>
<dt>Author</dt> <dd>djpaul</dd>
<dt>Date</dt> <dd>2014-03-06 19:50:21 +0000 (Thu, 06 Mar 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>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 <a href="http://buddypress.trac.wordpress.org/changeset/7663">r7663</a>, 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 <a href="http://buddypress.trac.wordpress.org/ticket/4929">#4929</a> and <a href="http://buddypress.trac.wordpress.org/ticket/5204">#5204</a></pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkbpcorebpcoretemplatephp">trunk/bp-core/bp-core-template.php</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkbpcorebpcoretemplatephp"></a>
<div class="modfile"><h4>Modified: trunk/bp-core/bp-core-template.php (8067 => 8068)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/bp-core/bp-core-template.php 2014-03-06 19:35:16 UTC (rev 8067)
+++ trunk/bp-core/bp-core-template.php 2014-03-06 19:50:21 UTC (rev 8068)
</span><span class="lines">@@ -2347,9 +2347,6 @@
</span><span class="cx"> if ( bp_is_user_groups_activity() )
</span><span class="cx"> $bp_classes[] = 'groups-activity';
</span><span class="cx">
</span><del>- if ( is_user_logged_in() )
- $bp_classes[] = 'logged-in';
-
</del><span class="cx"> /** Messages **********************************************************/
</span><span class="cx">
</span><span class="cx"> if ( bp_is_messages_inbox() )
</span><span class="lines">@@ -2421,37 +2418,14 @@
</span><span class="cx"> $bp_classes[] = bp_current_action();
</span><span class="cx"> }
</span><span class="cx">
</span><del>- /** is_buddypress *****************************************************/
</del><ins>+ /** Clean up ***********************************************************/
</ins><span class="cx">
</span><span class="cx"> // Add BuddyPress class if we are within a BuddyPress page
</span><span class="cx"> if ( ! bp_is_blog_page() ) {
</span><span class="cx"> $bp_classes[] = 'buddypress';
</span><span class="cx"> }
</span><span class="cx">
</span><del>- /** 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
</del><ins>+ // Merge WP classes with BuddyPress classes and remove any duplicates
</ins><span class="cx"> $classes = array_unique( array_merge( (array) $bp_classes, (array) $wp_classes ) );
</span><span class="cx">
</span><span class="cx"> return apply_filters( 'bp_get_the_body_class', $classes, $bp_classes, $wp_classes, $custom_classes );
</span></span></pre>
</div>
</div>
</body>
</html>