<!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] [3360] trunk: Fix more WP_DEBUG warnings</title>
</head>
<body>
<div id="msg">
<dl>
<dt>Revision</dt> <dd>3360</dd>
<dt>Author</dt> <dd>djpaul</dd>
<dt>Date</dt> <dd>2010-11-06 00:52:54 +0000 (Sat, 06 Nov 2010)</dd>
</dl>
<h3>Log Message</h3>
<pre>Fix more WP_DEBUG warnings</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkbpcorebpcoretemplatetagsphp">trunk/bp-core/bp-core-templatetags.php</a></li>
<li><a href="#trunkbpgroupsphp">trunk/bp-groups.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 (3359 => 3360)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/bp-core/bp-core-templatetags.php 2010-11-05 21:54:56 UTC (rev 3359)
+++ trunk/bp-core/bp-core-templatetags.php 2010-11-06 00:52:54 UTC (rev 3360)
</span><span class="lines">@@ -1479,10 +1479,10 @@
</span><span class="cx"> function bp_is_blog_page() {
</span><span class="cx"> global $bp, $is_member_page, $wp_query;
</span><span class="cx">
</span><del>- if ( $wp_query->is_home && !$bp->is_directory )
</del><ins>+ if ( $wp_query->is_home && ( !isset( $bp->is_directory ) || !$bp->is_directory ) )
</ins><span class="cx"> return true;
</span><span class="cx">
</span><del>- if ( !$bp->displayed_user->id && !$bp->is_single_item && !$bp->is_directory && !bp_core_is_root_component( $bp->current_component ) )
</del><ins>+ if ( !$bp->displayed_user->id && !$bp->is_single_item && ( !isset( $bp->is_directory ) || !$bp->is_directory ) && !bp_core_is_root_component( $bp->current_component ) )
</ins><span class="cx"> return true;
</span><span class="cx">
</span><span class="cx"> return false;
</span><span class="lines">@@ -1523,7 +1523,7 @@
</span><span class="cx"> function bp_is_directory() {
</span><span class="cx"> global $bp;
</span><span class="cx">
</span><del>- return $bp->is_directory;
</del><ins>+ return ( isset( $bp->is_directory ) && $bp->is_directory );
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> function bp_is_page($page) {
</span><span class="lines">@@ -1803,7 +1803,7 @@
</span><span class="cx"> function bp_is_user_blogs() {
</span><span class="cx"> global $bp;
</span><span class="cx">
</span><del>- if ( $bp->blogs->slug == $bp->current_component )
</del><ins>+ if ( is_multisite() && BP_BLOGS_SLUG == $bp->current_component )
</ins><span class="cx"> return true;
</span><span class="cx">
</span><span class="cx"> return false;
</span><span class="lines">@@ -1812,7 +1812,7 @@
</span><span class="cx"> function bp_is_user_recent_posts() {
</span><span class="cx"> global $bp;
</span><span class="cx">
</span><del>- if ( $bp->blogs->slug == $bp->current_component && 'recent-posts' == $bp->current_action )
</del><ins>+ if ( is_multisite() && BP_BLOGS_SLUG == $bp->current_component && 'recent-posts' == $bp->current_action )
</ins><span class="cx"> return true;
</span><span class="cx">
</span><span class="cx"> return false;
</span><span class="lines">@@ -1821,7 +1821,7 @@
</span><span class="cx"> function bp_is_user_recent_commments() {
</span><span class="cx"> global $bp;
</span><span class="cx">
</span><del>- if ( $bp->blogs->slug == $bp->current_component && 'recent-comments' == $bp->current_action )
</del><ins>+ if ( is_multisite() && BP_BLOGS_SLUG == $bp->current_component && 'recent-comments' == $bp->current_action )
</ins><span class="cx"> return true;
</span><span class="cx">
</span><span class="cx"> return false;
</span><span class="lines">@@ -1830,7 +1830,7 @@
</span><span class="cx"> function bp_is_create_blog() {
</span><span class="cx"> global $bp;
</span><span class="cx">
</span><del>- if ( BP_BLOGS_SLUG == $bp->current_component && 'create' == $bp->current_action )
</del><ins>+ if ( is_multisite() && BP_BLOGS_SLUG == $bp->current_component && 'create' == $bp->current_action )
</ins><span class="cx"> return true;
</span><span class="cx">
</span><span class="cx"> return false;
</span></span></pre></div>
<a id="trunkbpgroupsphp"></a>
<div class="modfile"><h4>Modified: trunk/bp-groups.php (3359 => 3360)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/bp-groups.php 2010-11-05 21:54:56 UTC (rev 3359)
+++ trunk/bp-groups.php 2010-11-06 00:52:54 UTC (rev 3360)
</span><span class="lines">@@ -146,7 +146,10 @@
</span><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx">
</span><del>- do_action( 'groups_setup_nav', $bp->groups->current_group->user_has_access );
</del><ins>+ if ( isset( $bp->groups->current_group->user_has_access ) )
+ do_action( 'groups_setup_nav', $bp->groups->current_group->user_has_access );
+ else
+ do_action( 'groups_setup_nav');
</ins><span class="cx"> }
</span><span class="cx"> add_action( 'bp_setup_nav', 'groups_setup_nav' );
</span><span class="cx">
</span></span></pre>
</div>
</div>
</body>
</html>