<!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][4624] trunk/bp-members/bp-members-notifications.php: Variable name cleanup to ensure that WP Admin Bar notification items get queued without overlapping each other.</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>4624</dd>
<dt>Author</dt> <dd>boonebgorges</dd>
<dt>Date</dt> <dd>2011-07-07 23:27:26 +0000 (Thu, 07 Jul 2011)</dd>
</dl>
<h3>Log Message</h3>
<pre>Variable name cleanup to ensure that WP Admin Bar notification items get queued without overlapping each other. Fixes #3294</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkbpmembersbpmembersnotificationsphp">trunk/bp-members/bp-members-notifications.php</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkbpmembersbpmembersnotificationsphp"></a>
<div class="modfile"><h4>Modified: trunk/bp-members/bp-members-notifications.php (4623 => 4624)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/bp-members/bp-members-notifications.php 2011-07-06 20:05:40 UTC (rev 4623)
+++ trunk/bp-members/bp-members-notifications.php 2011-07-07 23:27:26 UTC (rev 4624)
</span><span class="lines">@@ -56,7 +56,9 @@
</span><span class="cx">
</span><span class="cx"> if ( empty( $grouped_notifications ) )
</span><span class="cx"> return false;
</span><del>-
</del><ins>+
+ $renderable = array();
+
</ins><span class="cx"> // Calculate a renderable output for each notification type
</span><span class="cx"> foreach ( (array)$grouped_notifications as $component_name => $action_arrays ) {
</span><span class="cx"> if ( !$action_arrays )
</span><span class="lines">@@ -75,17 +77,21 @@
</span><span class="cx"> if ( 'object' == $format ) {
</span><span class="cx"> $content = call_user_func( $bp->{$component_name}->notification_callback, $component_action_name, $component_action_items[0]->item_id, $component_action_items[0]->secondary_item_id, $action_item_count, 'array' );
</span><span class="cx">
</span><ins>+ $notification_object = new stdClass;
+
</ins><span class="cx"> // Minimal backpat with non-compatible notification
</span><span class="cx"> // callback functions
</span><span class="cx"> if ( is_string( $content ) ) {
</span><del>- $notification->content = $content;
- $notification->href = bp_loggedin_user_domain();
</del><ins>+ $notification_object->content = $content;
+ $notification_object->href = bp_loggedin_user_domain();
</ins><span class="cx"> } else {
</span><del>- $notification->content = $content['text'];
- $notification->href = $content['link'];
</del><ins>+ $notification_object->content = $content['text'];
+ $notification_object->href = $content['link'];
</ins><span class="cx"> }
</span><span class="cx">
</span><del>- $renderable[] = $notification;
</del><ins>+ $notification_object->id = $component_action_items[0]->id;
+
+ $renderable[] = $notification_object;
</ins><span class="cx"> } else {
</span><span class="cx"> $content = call_user_func( $bp->{$component_name}->notification_callback, $component_action_name, $component_action_items[0]->item_id, $component_action_items[0]->secondary_item_id, $action_item_count );
</span><span class="cx"> $renderable[] = $content;
</span></span></pre>
</div>
</div>
</body>
</html>