<!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][6023] trunk: Don't assign values to undefined objects throughout BP.</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, #logmsg > ol { margin-left: 0; 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/6023">6023</a></dd>
<dt>Author</dt> <dd>boonebgorges</dd>
<dt>Date</dt> <dd>2012-05-11 17:55:13 +0000 (Fri, 11 May 2012)</dd>
</dl>
<h3>Log Message</h3>
<pre>Don't assign values to undefined objects throughout BP. Fixes <a href="http://buddypress.trac.wordpress.org/ticket/4191">#4191</a>. Props leemour</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkbpactivitybpactivityfunctionsphp">trunk/bp-activity/bp-activity-functions.php</a></li>
<li><a href="#trunkbpcorebpcoreavatarsphp">trunk/bp-core/bp-core-avatars.php</a></li>
<li><a href="#trunkbpcorebpcorefunctionsphp">trunk/bp-core/bp-core-functions.php</a></li>
<li><a href="#trunkbpcorebpcoreloaderphp">trunk/bp-core/bp-core-loader.php</a></li>
<li><a href="#trunkbpforumsbpforumstemplatephp">trunk/bp-forums/bp-forums-template.php</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkbpactivitybpactivityfunctionsphp"></a>
<div class="modfile"><h4>Modified: trunk/bp-activity/bp-activity-functions.php (6022 => 6023)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/bp-activity/bp-activity-functions.php 2012-05-11 17:38:50 UTC (rev 6022)
+++ trunk/bp-activity/bp-activity-functions.php 2012-05-11 17:55:13 UTC (rev 6023)
</span><span class="lines">@@ -197,6 +197,14 @@
</span><span class="cx"> return false;
</span><span class="cx">
</span><span class="cx"> // Set activity action
</span><ins>+ if ( !isset( $bp->activity->actions ) || !is_object( $bp->activity->actions ) ) {
+ $bp->activity->actions = new stdClass;
+ }
+
+ if ( !isset( $bp->activity->actions->{$component_id} ) || !is_object( $bp->activity->actions->{$component_id} ) ) {
+ $bp->activity->actions->{$component_id} = new stdClass;
+ }
+
</ins><span class="cx"> $bp->activity->actions->{$component_id}->{$key} = apply_filters( 'bp_activity_set_action', array(
</span><span class="cx"> 'key' => $key,
</span><span class="cx"> 'value' => $value
</span></span></pre></div>
<a id="trunkbpcorebpcoreavatarsphp"></a>
<div class="modfile"><h4>Modified: trunk/bp-core/bp-core-avatars.php (6022 => 6023)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/bp-core/bp-core-avatars.php 2012-05-11 17:38:50 UTC (rev 6022)
+++ trunk/bp-core/bp-core-avatars.php 2012-05-11 17:55:13 UTC (rev 6023)
</span><span class="lines">@@ -49,6 +49,10 @@
</span><span class="cx"> function bp_core_set_avatar_globals() {
</span><span class="cx"> global $bp;
</span><span class="cx">
</span><ins>+ $bp->avatar = new stdClass;
+ $bp->avatar->thumb = new stdClass;
+ $bp->avatar->full = new stdClass;
+
</ins><span class="cx"> // Dimensions
</span><span class="cx"> $bp->avatar->thumb->width = BP_AVATAR_THUMB_WIDTH;
</span><span class="cx"> $bp->avatar->thumb->height = BP_AVATAR_THUMB_HEIGHT;
</span></span></pre></div>
<a id="trunkbpcorebpcorefunctionsphp"></a>
<div class="modfile"><h4>Modified: trunk/bp-core/bp-core-functions.php (6022 => 6023)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/bp-core/bp-core-functions.php 2012-05-11 17:38:50 UTC (rev 6022)
+++ trunk/bp-core/bp-core-functions.php 2012-05-11 17:55:13 UTC (rev 6023)
</span><span class="lines">@@ -178,6 +178,10 @@
</span><span class="cx"> foreach ( (array) $page_ids as $component_id => $page_id ) {
</span><span class="cx"> foreach ( (array) $page_names as $page_name ) {
</span><span class="cx"> if ( $page_name->ID == $page_id ) {
</span><ins>+ if ( !isset( $pages->{$component_id} ) || !is_object( $pages->{$component_id} ) ) {
+ $pages->{$component_id} = new stdClass;
+ }
+
</ins><span class="cx"> $pages->{$component_id}->name = $page_name->post_name;
</span><span class="cx"> $pages->{$component_id}->id = $page_name->ID;
</span><span class="cx"> $pages->{$component_id}->title = $page_name->post_title;
</span></span></pre></div>
<a id="trunkbpcorebpcoreloaderphp"></a>
<div class="modfile"><h4>Modified: trunk/bp-core/bp-core-loader.php (6022 => 6023)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/bp-core/bp-core-loader.php 2012-05-11 17:38:50 UTC (rev 6022)
+++ trunk/bp-core/bp-core-loader.php 2012-05-11 17:55:13 UTC (rev 6023)
</span><span class="lines">@@ -162,11 +162,13 @@
</span><span class="cx"> $current_user = wp_get_current_user();
</span><span class="cx">
</span><span class="cx"> // The user ID of the user who is currently logged in.
</span><ins>+ $bp->loggedin_user = new stdClass;
</ins><span class="cx"> $bp->loggedin_user->id = isset( $current_user->ID ) ? $current_user->ID : 0;
</span><span class="cx">
</span><span class="cx"> /** Avatars ***********************************************************/
</span><span class="cx">
</span><span class="cx"> // Fetches the default Gravatar image to use if the user/group/blog has no avatar or gravatar
</span><ins>+ $bp->grav_default = new stdClass;
</ins><span class="cx"> $bp->grav_default->user = apply_filters( 'bp_user_gravatar_default', $bp->site_options['avatar_default'] );
</span><span class="cx"> $bp->grav_default->group = apply_filters( 'bp_group_gravatar_default', $bp->grav_default->user );
</span><span class="cx"> $bp->grav_default->blog = apply_filters( 'bp_blog_gravatar_default', $bp->grav_default->user );
</span></span></pre></div>
<a id="trunkbpforumsbpforumstemplatephp"></a>
<div class="modfile"><h4>Modified: trunk/bp-forums/bp-forums-template.php (6022 => 6023)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/bp-forums/bp-forums-template.php 2012-05-11 17:38:50 UTC (rev 6022)
+++ trunk/bp-forums/bp-forums-template.php 2012-05-11 17:55:13 UTC (rev 6023)
</span><span class="lines">@@ -1037,6 +1037,8 @@
</span><span class="cx"> // Load topic tags
</span><span class="cx"> $this->topic_tags = bb_get_topic_tags( $this->topic_id );
</span><span class="cx">
</span><ins>+ $this->pag = new stdClass;
+
</ins><span class="cx"> if ( (int) $this->total_post_count && (int) $this->pag_num ) {
</span><span class="cx"> $this->pag_links = paginate_links( array(
</span><span class="cx"> 'base' => add_query_arg( array( 'topic_page' => '%#%', 'num' => (int) $this->pag_num ) ),
</span></span></pre>
</div>
</div>
</body>
</html>