<!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][5211] trunk/bp-members/bp-members-adminbar.php: Updates user admin bar menu for right-floating compatibility in WP 3.3.</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/5211">5211</a></dd>
<dt>Author</dt> <dd>boonebgorges</dd>
<dt>Date</dt> <dd>2011-10-06 14:41:17 +0000 (Thu, 06 Oct 2011)</dd>
</dl>
<h3>Log Message</h3>
<pre>Updates user admin bar menu for right-floating compatibility in WP 3.3. See <a href="http://buddypress.trac.wordpress.org/ticket/3596">#3596</a></pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkbpmembersbpmembersadminbarphp">trunk/bp-members/bp-members-adminbar.php</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkbpmembersbpmembersadminbarphp"></a>
<div class="modfile"><h4>Modified: trunk/bp-members/bp-members-adminbar.php (5210 => 5211)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/bp-members/bp-members-adminbar.php 2011-10-03 14:07:38 UTC (rev 5210)
+++ trunk/bp-members/bp-members-adminbar.php 2011-10-06 14:41:17 UTC (rev 5211)
</span><span class="lines">@@ -15,9 +15,10 @@
</span><span class="cx"> * Add the "My Account" menu and all submenus.
</span><span class="cx"> *
</span><span class="cx"> * @since BuddyPress (r4151)
</span><ins>+ * @todo Deprecate WP 3.2 admin bar compatibility when we drop 3.2 support
</ins><span class="cx"> */
</span><span class="cx"> function bp_members_admin_bar_my_account_menu() {
</span><del>- global $bp, $wp_admin_bar;
</del><ins>+ global $bp, $wp_admin_bar, $wp_version;
</ins><span class="cx">
</span><span class="cx"> // Bail if this is an ajax request
</span><span class="cx"> if ( defined( 'DOING_AJAX' ) )
</span><span class="lines">@@ -34,14 +35,33 @@
</span><span class="cx"> 'height' => 16
</span><span class="cx"> ) );
</span><span class="cx">
</span><del>- // Unique ID for the 'My Account' menu
- $bp->my_account_menu_id = ( ! empty( $avatar ) ) ? 'my-account-with-avatar' : 'my-account';
</del><ins>+ // Some admin bar setup in WP 3.2 differs from WP 3.3+.
+ // Backward-compatibility will be deprecated at some point.
+ if ( version_compare( (float)$wp_version, '3.3', '>=' ) ) {
+ // Stored in the global so we can add menus easily later on
+ $bp->my_account_menu_id = 'my-account';
</ins><span class="cx">
</span><ins>+ $title = bp_get_loggedin_user_fullname() . $avatar;
+
+ $class = 'opposite';
+ if ( !empty( $avatar ) )
+ $class .= ' with-avatar';
+
+ $meta = array(
+ 'class' => $class
+ );
+ } else {
+ $bp->my_account_menu_id = ( ! empty( $avatar ) ) ? 'my-account-with-avatar' : 'my-account';
+ $title = $avatar . bp_get_loggedin_user_fullname();
+ $meta = array();
+ }
+
</ins><span class="cx"> // Create the main 'My Account' menu
</span><span class="cx"> $wp_admin_bar->add_menu( array(
</span><span class="cx"> 'id' => $bp->my_account_menu_id,
</span><del>- 'title' => $avatar . bp_get_loggedin_user_fullname(),
- 'href' => $bp->loggedin_user->domain
</del><ins>+ 'title' => $title,
+ 'href' => $bp->loggedin_user->domain,
+ 'meta' => $meta
</ins><span class="cx"> ) );
</span><span class="cx">
</span><span class="cx"> // Show login and sign-up links
</span></span></pre>
</div>
</div>
</body>
</html>