<!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] [3465] trunk: Clears out some WP_DEBUG warnings</title>
</head>
<body>
<div id="msg">
<dl>
<dt>Revision</dt> <dd>3465</dd>
<dt>Author</dt> <dd>boonebgorges</dd>
<dt>Date</dt> <dd>2010-11-21 17:13:03 +0000 (Sun, 21 Nov 2010)</dd>
</dl>
<h3>Log Message</h3>
<pre>Clears out some WP_DEBUG warnings</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkbpactivitybpactivitytemplatetagsphp">trunk/bp-activity/bp-activity-templatetags.php</a></li>
<li><a href="#trunkbpblogsbpblogsclassesphp">trunk/bp-blogs/bp-blogs-classes.php</a></li>
<li><a href="#trunkbpcorebpcoreavatarsphp">trunk/bp-core/bp-core-avatars.php</a></li>
<li><a href="#trunkbpgroupsbpgroupsclassesphp">trunk/bp-groups/bp-groups-classes.php</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkbpactivitybpactivitytemplatetagsphp"></a>
<div class="modfile"><h4>Modified: trunk/bp-activity/bp-activity-templatetags.php (3464 => 3465)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/bp-activity/bp-activity-templatetags.php 2010-11-21 16:58:53 UTC (rev 3464)
+++ trunk/bp-activity/bp-activity-templatetags.php 2010-11-21 17:13:03 UTC (rev 3465)
</span><span class="lines">@@ -22,7 +22,7 @@
</span><span class="cx"> $this->pag_num = isset( $_REQUEST['num'] ) ? intval( $_REQUEST['num'] ) : $per_page;
</span><span class="cx">
</span><span class="cx"> // Check if blog/forum replies are disabled
</span><del>- $this->disable_blogforum_replies = $bp->site_options['bp-disable-blogforum-comments'];
</del><ins>+ $this->disable_blogforum_replies = isset( $bp->site_options['bp-disable-blogforum-comments'] ) ? $bp->site_options['bp-disable-blogforum-comments'] : false;
</ins><span class="cx">
</span><span class="cx"> // Get an array of the logged in user's favorite activities
</span><span class="cx"> $this->my_favs = maybe_unserialize( get_user_meta( $bp->loggedin_user->id, 'bp_favorite_activities', true ) );
</span></span></pre></div>
<a id="trunkbpblogsbpblogsclassesphp"></a>
<div class="modfile"><h4>Modified: trunk/bp-blogs/bp-blogs-classes.php (3464 => 3465)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/bp-blogs/bp-blogs-classes.php 2010-11-21 16:58:53 UTC (rev 3464)
+++ trunk/bp-blogs/bp-blogs-classes.php 2010-11-21 17:13:03 UTC (rev 3465)
</span><span class="lines">@@ -167,6 +167,7 @@
</span><span class="cx">
</span><span class="cx"> $total_blog_count = BP_Blogs_Blog::total_blog_count_for_user( $user_id );
</span><span class="cx">
</span><ins>+ $user_blogs = array();
</ins><span class="cx"> foreach ( (array)$blogs as $blog ) {
</span><span class="cx"> $user_blogs[$blog->blog_id] = new stdClass;
</span><span class="cx"> $user_blogs[$blog->blog_id]->id = $blog->id;
</span></span></pre></div>
<a id="trunkbpcorebpcoreavatarsphp"></a>
<div class="modfile"><h4>Modified: trunk/bp-core/bp-core-avatars.php (3464 => 3465)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/bp-core/bp-core-avatars.php 2010-11-21 16:58:53 UTC (rev 3464)
+++ trunk/bp-core/bp-core-avatars.php 2010-11-21 17:13:03 UTC (rev 3465)
</span><span class="lines">@@ -191,7 +191,7 @@
</span><span class="cx"> closedir( $av_dir );
</span><span class="cx">
</span><span class="cx"> // If we found a locally uploaded avatar
</span><del>- if ( $avatar_url ) {
</del><ins>+ if ( isset( $avatar_url ) ) {
</ins><span class="cx">
</span><span class="cx"> // Return it wrapped in an <img> element
</span><span class="cx"> if ( true === $html ) {
</span></span></pre></div>
<a id="trunkbpgroupsbpgroupsclassesphp"></a>
<div class="modfile"><h4>Modified: trunk/bp-groups/bp-groups-classes.php (3464 => 3465)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/bp-groups/bp-groups-classes.php 2010-11-21 16:58:53 UTC (rev 3464)
+++ trunk/bp-groups/bp-groups-classes.php 2010-11-21 17:13:03 UTC (rev 3465)
</span><span class="lines">@@ -273,7 +273,7 @@
</span><span class="cx">
</span><span class="cx"> $sql['where'] = " g.id = gm1.group_id AND g.id = gm2.group_id AND gm2.meta_key = 'last_activity' AND gm1.meta_key = 'total_member_count'";
</span><span class="cx">
</span><del>- if ( !is_user_logged_in() || ( !is_site_admin() && ( $user_id != $bp->loggedin_user->id ) ) )
</del><ins>+ if ( !is_user_logged_in() || ( !is_super_admin() && ( $user_id != $bp->loggedin_user->id ) ) )
</ins><span class="cx"> $sql['hidden'] = " AND g.status != 'hidden'";
</span><span class="cx">
</span><span class="cx"> if ( $search_terms ) {
</span></span></pre>
</div>
</div>
</body>
</html>