<!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" /><style type="text/css"><!--
#msg dl { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer { 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 #fc0 solid; padding: 6px; }
#msg ul, pre { overflow: auto; }
#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>
<title>[BuddyPress] [1939] trunk: Fixes #1061, #987</title>
</head>
<body>
<div id="msg">
<dl>
<dt>Revision</dt> <dd>1939</dd>
<dt>Author</dt> <dd>apeatling</dd>
<dt>Date</dt> <dd>2009-09-23 03:50:34 +0000 (Wed, 23 Sep 2009)</dd>
</dl>
<h3>Log Message</h3>
<pre>Fixes #1061, #987</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkbpcorebpcoretemplatetagsphp">trunk/bp-core/bp-core-templatetags.php</a></li>
<li><a href="#trunkbpthemesbpdefault_inccssscreencss">trunk/bp-themes/bp-default/_inc/css/screen.css</a></li>
<li><a href="#trunkbpthemesbpsnparent_inccsslayoutblogdirpages2ccentercss">trunk/bp-themes/bp-sn-parent/_inc/css/layout/blog-dir-pages/2c-center.css</a></li>
<li><a href="#trunkbpthemesbpsnparent_inccsslayoutblogdirpages2cleftcss">trunk/bp-themes/bp-sn-parent/_inc/css/layout/blog-dir-pages/2c-left.css</a></li>
<li><a href="#trunkbpthemesbpsnparent_inccsslayoutblogdirpages2crightcss">trunk/bp-themes/bp-sn-parent/_inc/css/layout/blog-dir-pages/2c-right.css</a></li>
</ul>
<h3>Removed Paths</h3>
<ul>
<li><a href="#trunkbpforumsinstallationreadmetxt">trunk/bp-forums/installation-readme.txt</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkbpcorebpcoretemplatetagsphp"></a>
<div class="modfile"><h4>Modified: trunk/bp-core/bp-core-templatetags.php (1938 => 1939)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/bp-core/bp-core-templatetags.php 2009-09-23 02:54:38 UTC (rev 1938)
+++ trunk/bp-core/bp-core-templatetags.php 2009-09-23 03:50:34 UTC (rev 1939)
</span><span class="lines">@@ -1585,16 +1585,18 @@
</span><span class="cx"> function bp_the_body_class() {
</span><span class="cx"> echo bp_get_the_body_class();
</span><span class="cx"> }
</span><del>- function bp_get_the_body_class( $wp_classes ) {
- if ( bp_is_blog_page() || bp_is_activation_page() || bp_is_register_page() )
</del><ins>+ function bp_get_the_body_class( $wp_classes, $custom_classes ) {
+ global $bp;
+
+ if ( $bp->current_component != BP_HOME_BLOG_SLUG && !bp_is_register_page() && !bp_is_activation_page() && !bp_is_directory() && bp_is_blog_page() )
+ $bp_classes[] = 'home-page';
+
+ if ( ( $bp->current_component == BP_HOME_BLOG_SLUG || bp_is_activation_page() || bp_is_register_page() ) )
</ins><span class="cx"> $bp_classes[] = 'blog-page';
</span><span class="cx">
</span><del>- if ( !bp_is_blog_page() && !is_home() && !bp_is_register_page() && !bp_is_activation_page() )
</del><ins>+ if ( !bp_is_blog_page() && !bp_is_register_page() && !bp_is_activation_page() )
</ins><span class="cx"> $bp_classes[] = 'internal-page';
</span><span class="cx">
</span><del>- if ( bp_is_blog_page() && is_home() )
- $bp_classes[] = 'home-page';
-
</del><span class="cx"> if ( bp_is_directory() )
</span><span class="cx"> $bp_classes[] = 'directory';
</span><span class="cx">
</span><span class="lines">@@ -1696,35 +1698,34 @@
</span><span class="cx">
</span><span class="cx"> if ( bp_is_activation_page() )
</span><span class="cx"> $bp_classes[] = 'activation';
</span><del>-
- if ( is_single() )
- $bp_classes[] = 'blog-single';
</del><span class="cx">
</span><del>- if ( is_category() )
- $bp_classes[] = 'blog-category';
-
- if ( is_tag() )
- $bp_classes[] = 'blog-tag';
-
- if ( is_search() )
- $bp_classes[] = 'blog-search';
-
- if ( is_day() )
- $bp_classes[] = 'blog-day';
-
- if ( is_month() )
- $bp_classes[] = 'blog-month';
-
- if ( is_year() )
- $bp_classes[] = 'blog-year';
</del><ins>+ /* Add the current_component, current_action into the bp classes */
+ if ( !bp_is_blog_page() ) {
+ if ( !empty( $bp->current_component ) )
+ $bp_classes[] = $bp->current_component;
</ins><span class="cx">
</span><ins>+ if ( !empty( $bp->current_action ) )
+ $bp_classes[] = $bp->current_action;
+ }
+
</ins><span class="cx"> /* We don't want WordPress blog classes to appear on non-blog pages. */
</span><del>- if ( !bp_is_blog_page() )
- $wp_classes = array();
</del><ins>+ if ( !bp_is_blog_page() || is_home() ) {
+ /* 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 */
+ $classes = array_merge( (array) $bp_classes, (array) $wp_classes );
</ins><span class="cx">
</span><del>- return apply_filters( 'bp_get_the_body_class', array_merge( (array) $bp_classes, (array) $wp_classes ), $bp_classes, $wp_classes );
</del><ins>+ /* Remove any duplicates */
+ $classes = array_unique( $classes );
+
+ return apply_filters( 'bp_get_the_body_class', $classes, $bp_classes, $wp_classes, $custom_classes );
</ins><span class="cx"> }
</span><del>- add_filter( 'body_class', 'bp_get_the_body_class' )
</del><ins>+ add_filter( 'body_class', 'bp_get_the_body_class', 10, 2 )
</ins><span class="cx">
</span><span class="cx">
</span><span class="cx"> ?>
</span><span class="cx">\ No newline at end of file
</span></span></pre></div>
<a id="trunkbpforumsinstallationreadmetxt"></a>
<div class="delfile"><h4>Deleted: trunk/bp-forums/installation-readme.txt (1938 => 1939)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/bp-forums/installation-readme.txt 2009-09-23 02:54:38 UTC (rev 1938)
+++ trunk/bp-forums/installation-readme.txt 2009-09-23 03:50:34 UTC (rev 1939)
</span><span class="lines">@@ -1,4 +0,0 @@
</span><del>-Installing and setting up bp-forums
-'''''''''''''''''''''''''''''''''''
-
-Please sign in to WordPress as a site admin and head to "BuddyPress > Forums Setup" to install.
</del></span></pre></div>
<a id="trunkbpthemesbpdefault_inccssscreencss"></a>
<div class="modfile"><h4>Modified: trunk/bp-themes/bp-default/_inc/css/screen.css (1938 => 1939)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/bp-themes/bp-default/_inc/css/screen.css 2009-09-23 02:54:38 UTC (rev 1938)
+++ trunk/bp-themes/bp-default/_inc/css/screen.css 2009-09-23 03:50:34 UTC (rev 1939)
</span><span class="lines">@@ -138,8 +138,8 @@
</span><span class="cx"> margin-left: 0;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-.blog-page #container, .directory #container {
- padding-top: 5px;
</del><ins>+.blog-page #container, .directory #container, .home-page #container {
+ padding: 5px 20px 20px 20px;
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> /*** Content Header *************************************************************/
</span><span class="lines">@@ -884,7 +884,7 @@
</span><span class="cx"> font-size: 1em;
</span><span class="cx"> }
</span><span class="cx">
</span><del>- #third-section .widget h2, .page h2.pagetitle {
</del><ins>+ #third-section .widget h2{
</ins><span class="cx"> background: url(../images/rightcol_header_back.gif) top left no-repeat;
</span><span class="cx"> color: #fff;
</span><span class="cx"> }
</span><span class="lines">@@ -894,7 +894,7 @@
</span><span class="cx"> color: #fff;
</span><span class="cx"> }
</span><span class="cx">
</span><del>- #first-section .widget h2, #sidebar h2.widgettitle {
</del><ins>+ #first-section .widget h2, #sidebar h2.widgettitle, .page h2.pagetitle {
</ins><span class="cx"> background: url(../images/leftcol_header_back.gif) top left no-repeat;
</span><span class="cx">
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkbpthemesbpsnparent_inccsslayoutblogdirpages2ccentercss"></a>
<div class="modfile"><h4>Modified: trunk/bp-themes/bp-sn-parent/_inc/css/layout/blog-dir-pages/2c-center.css (1938 => 1939)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/bp-themes/bp-sn-parent/_inc/css/layout/blog-dir-pages/2c-center.css 2009-09-23 02:54:38 UTC (rev 1938)
+++ trunk/bp-themes/bp-sn-parent/_inc/css/layout/blog-dir-pages/2c-center.css 2009-09-23 03:50:34 UTC (rev 1939)
</span><span class="lines">@@ -1,8 +1,3 @@
</span><del>-.blog-page #container, .directory #container {
- padding: 20px;
- position: relative;
-}
-
</del><span class="cx"> .blog-page #content, .directory #content {
</span><span class="cx"> float: left;
</span><span class="cx"> width: 46%;
</span></span></pre></div>
<a id="trunkbpthemesbpsnparent_inccsslayoutblogdirpages2cleftcss"></a>
<div class="modfile"><h4>Modified: trunk/bp-themes/bp-sn-parent/_inc/css/layout/blog-dir-pages/2c-left.css (1938 => 1939)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/bp-themes/bp-sn-parent/_inc/css/layout/blog-dir-pages/2c-left.css 2009-09-23 02:54:38 UTC (rev 1938)
+++ trunk/bp-themes/bp-sn-parent/_inc/css/layout/blog-dir-pages/2c-left.css 2009-09-23 03:50:34 UTC (rev 1939)
</span><span class="lines">@@ -1,7 +1,3 @@
</span><del>-.blog-page #container, .directory #container {
- padding: 20px;
-}
-
</del><span class="cx"> .blog-page #content, .directory #content {
</span><span class="cx"> float: right;
</span><span class="cx"> width: 100%;
</span></span></pre></div>
<a id="trunkbpthemesbpsnparent_inccsslayoutblogdirpages2crightcss"></a>
<div class="modfile"><h4>Modified: trunk/bp-themes/bp-sn-parent/_inc/css/layout/blog-dir-pages/2c-right.css (1938 => 1939)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/bp-themes/bp-sn-parent/_inc/css/layout/blog-dir-pages/2c-right.css 2009-09-23 02:54:38 UTC (rev 1938)
+++ trunk/bp-themes/bp-sn-parent/_inc/css/layout/blog-dir-pages/2c-right.css 2009-09-23 03:50:34 UTC (rev 1939)
</span><span class="lines">@@ -1,7 +1,3 @@
</span><del>-.blog-page #container, .directory #container {
- padding: 20px;
-}
-
</del><span class="cx"> .blog-page #content, .directory #content {
</span><span class="cx"> float: left;
</span><span class="cx"> width: 100%;
</span></span></pre>
</div>
</div>
</body>
</html>