<!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] [2647] trunk: Fixes #1873, Fixes #1869</title>
</head>
<body>
<div id="msg">
<dl>
<dt>Revision</dt> <dd>2647</dd>
<dt>Author</dt> <dd>apeatling</dd>
<dt>Date</dt> <dd>2010-02-10 16:21:27 +0000 (Wed, 10 Feb 2010)</dd>
</dl>
<h3>Log Message</h3>
<pre>Fixes #1873, Fixes #1869</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkbpcorebpcoretemplatetagsphp">trunk/bp-core/bp-core-templatetags.php</a></li>
<li><a href="#trunkbpthemesbpdefault_inccssdefaultcss">trunk/bp-themes/bp-default/_inc/css/default.css</a></li>
<li><a href="#trunkbpthemesbpdefaultfunctionsphp">trunk/bp-themes/bp-default/functions.php</a></li>
<li><a href="#trunkbpthemesbpdefaultheaderphp">trunk/bp-themes/bp-default/header.php</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 (2646 => 2647)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/bp-core/bp-core-templatetags.php 2010-02-10 15:26:24 UTC (rev 2646)
+++ trunk/bp-core/bp-core-templatetags.php 2010-02-10 16:21:27 UTC (rev 2647)
</span><span class="lines">@@ -941,18 +941,6 @@
</span><span class="cx"> wp_print_styles();
</span><span class="cx"> }
</span><span class="cx">
</span><del>-function bp_is_page($page) {
- global $bp;
-
- if ( !$bp->displayed_user->id && $bp->current_component == $page )
- return true;
-
- if ( 'home' == $page && !$bp->current_component )
- return true;
-
- return false;
-}
-
</del><span class="cx"> function bp_has_custom_signup_page() {
</span><span class="cx"> if ( locate_template( array( 'register.php' ), false ) || locate_template( array( '/registration/register.php' ), false ) )
</span><span class="cx"> return true;
</span><span class="lines">@@ -1390,6 +1378,31 @@
</span><span class="cx">
</span><span class="cx"> /* Template is_() functions to determine the current page */
</span><span class="cx">
</span><ins>+function bp_is_front_page() {
+ if ( 'posts' == get_option('show_on_front') && is_home() )
+ return true;
+ else if ( bp_is_activity_front_page() )
+ return true;
+ else
+ return is_front_page();
+}
+
+function bp_is_activity_front_page() {
+ return ( 'page' == get_option('show_on_front') && 'activity' == get_option('page_on_front') && $_SERVER['REQUEST_URI'] == bp_core_get_site_path() );
+}
+
+function bp_is_page($page) {
+ global $bp;
+
+ if ( !$bp->displayed_user->id && $bp->current_component == $page )
+ return true;
+
+ if ( 'home' == $page )
+ return bp_is_front_page();
+
+ return false;
+}
+
</ins><span class="cx"> function bp_is_active( $component ) {
</span><span class="cx"> global $bp_deactivated;
</span><span class="cx">
</span><span class="lines">@@ -1779,22 +1792,16 @@
</span><span class="cx"> function bp_get_the_body_class( $wp_classes, $custom_classes = false ) {
</span><span class="cx"> global $bp;
</span><span class="cx">
</span><del>- if ( is_front_page() && $bp->current_component != BP_HOME_BLOG_SLUG )
</del><ins>+ if ( bp_is_front_page() )
</ins><span class="cx"> $bp_classes[] = 'home-page';
</span><span class="cx">
</span><del>- if ( ( bp_is_blog_page() || bp_is_register_page() || bp_is_activation_page() ) && !is_page() )
- $bp_classes[] = 'blog-page';
-
- if ( !bp_is_blog_page() && !bp_is_register_page() && !bp_is_activation_page() )
- $bp_classes[] = 'internal-page';
-
</del><span class="cx"> if ( bp_is_directory() )
</span><span class="cx"> $bp_classes[] = 'directory';
</span><span class="cx">
</span><span class="cx"> if ( bp_is_user_profile() && !bp_is_blog_page() )
</span><span class="cx"> $bp_classes[] = 'profile';
</span><span class="cx">
</span><del>- if ( bp_is_activity_component() && !bp_is_blog_page() )
</del><ins>+ if ( bp_is_activity_component() && !bp_is_blog_page() || ( bp_is_activity_front_page() && bp_is_front_page() ) )
</ins><span class="cx"> $bp_classes[] = 'activity';
</span><span class="cx">
</span><span class="cx"> if ( bp_is_blogs_component() && !bp_is_blog_page() )
</span><span class="lines">@@ -1884,7 +1891,7 @@
</span><span class="cx"> if ( bp_is_user_friends_activity() )
</span><span class="cx"> $bp_classes[] = 'friends-activity';
</span><span class="cx">
</span><del>- if ( bp_is_user_activity() )
</del><ins>+ if ( bp_is_user_activity() && !bp_is_directory() )
</ins><span class="cx"> $bp_classes[] = 'my-activity';
</span><span class="cx">
</span><span class="cx"> if ( bp_is_activity_permalink() )
</span></span></pre></div>
<a id="trunkbpthemesbpdefault_inccssdefaultcss"></a>
<div class="modfile"><h4>Modified: trunk/bp-themes/bp-default/_inc/css/default.css (2646 => 2647)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/bp-themes/bp-default/_inc/css/default.css 2010-02-10 15:26:24 UTC (rev 2646)
+++ trunk/bp-themes/bp-default/_inc/css/default.css 2010-02-10 16:21:27 UTC (rev 2647)
</span><span class="lines">@@ -1262,9 +1262,6 @@
</span><span class="cx"> width: auto;
</span><span class="cx"> overflow: hidden; /* IE fix */
</span><span class="cx"> }
</span><del>- body.internal-page div.activity-comments {
- width: auto;
- }
</del><span class="cx">
</span><span class="cx"> body.activity-permalink div.activity-comments {
</span><span class="cx"> width: auto;
</span></span></pre></div>
<a id="trunkbpthemesbpdefaultfunctionsphp"></a>
<div class="modfile"><h4>Modified: trunk/bp-themes/bp-default/functions.php (2646 => 2647)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/bp-themes/bp-default/functions.php 2010-02-10 15:26:24 UTC (rev 2646)
+++ trunk/bp-themes/bp-default/functions.php 2010-02-10 16:21:27 UTC (rev 2647)
</span><span class="lines">@@ -236,22 +236,4 @@
</span><span class="cx"> add_action( 'admin_notices', 'bp_dtheme_show_notice' );
</span><span class="cx"> }
</span><span class="cx">
</span><del>-/* Adjust home page body class if activity stream is home */
-function bp_dtheme_body_class_home( $classes, $bp_classes, $wp_classes, $custom_classes ) {
- if ( !is_home() )
- return apply_filters( 'bp_dtheme_body_class_home', $classes, $bp_classes, $wp_classes, $custom_classes );
-
- if ( bp_is_active( 'activity' ) ) {
- if ( 'activity' == bp_dtheme_page_on_front() ) {
- $blog = array_keys( $classes, 'blog-page' );
- $classes[$blog[0]] = 'activity';
- $classes[] = 'directory';
- $classes[] = 'internal-page';
- $classes[] = 'my-activity';
- }
- }
- return apply_filters( 'bp_dtheme_body_class_home', $classes, $bp_classes, $wp_classes, $custom_classes );
-}
-add_filter( 'bp_get_the_body_class', 'bp_dtheme_body_class_home', 10, 4 );
-
</del><span class="cx"> ?>
</span><span class="cx">\ No newline at end of file
</span></span></pre></div>
<a id="trunkbpthemesbpdefaultheaderphp"></a>
<div class="modfile"><h4>Modified: trunk/bp-themes/bp-default/header.php (2646 => 2647)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/bp-themes/bp-default/header.php 2010-02-10 15:26:24 UTC (rev 2646)
+++ trunk/bp-themes/bp-default/header.php 2010-02-10 16:21:27 UTC (rev 2647)
</span><span class="lines">@@ -44,7 +44,7 @@
</span><span class="cx"> <h1 id="logo"><a href="<?php echo site_url() ?>" title="<?php _e( 'Home', 'buddypress' ) ?>"><?php bp_site_name() ?></a></h1>
</span><span class="cx">
</span><span class="cx"> <ul id="nav">
</span><del>- <li<?php if ( is_front_page() || !bp_current_component() ) : ?> class="selected"<?php endif; ?>>
</del><ins>+ <li<?php if ( bp_is_front_page() ) : ?> class="selected"<?php endif; ?>>
</ins><span class="cx"> <a href="<?php echo site_url() ?>" title="<?php _e( 'Home', 'buddypress' ) ?>"><?php _e( 'Home', 'buddypress' ) ?></a>
</span><span class="cx"> </li>
</span><span class="cx">
</span></span></pre>
</div>
</div>
</body>
</html>