<!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][8277] trunk: Proper ordering for Settings subnav items in WP Admin Bar</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 { text-indent: -1em; padding-left: 1em; }#logmsg ol { text-indent: -1.5em; padding-left: 1.5em; }
#logmsg > ul, #logmsg > ol { 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/8277">8277</a></dd>
<dt>Author</dt> <dd>boonebgorges</dd>
<dt>Date</dt> <dd>2014-04-16 14:13:53 +0000 (Wed, 16 Apr 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>Proper ordering for Settings subnav items in WP Admin Bar
Fixes <a href="http://buddypress.trac.wordpress.org/ticket/5537">#5537</a>
Props r-a-y</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkbpactivitybpactivityloaderphp">trunk/bp-activity/bp-activity-loader.php</a></li>
<li><a href="#trunkbpxprofilebpxprofileloaderphp">trunk/bp-xprofile/bp-xprofile-loader.php</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkbpactivitybpactivityloaderphp"></a>
<div class="modfile"><h4>Modified: trunk/bp-activity/bp-activity-loader.php (8276 => 8277)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/bp-activity/bp-activity-loader.php 2014-04-15 21:37:51 UTC (rev 8276)
+++ trunk/bp-activity/bp-activity-loader.php 2014-04-16 14:13:53 UTC (rev 8277)
</span><span class="lines">@@ -269,6 +269,14 @@
</span><span class="cx"> 'href' => trailingslashit( $activity_link )
</span><span class="cx"> );
</span><span class="cx">
</span><ins>+ // Personal
+ $wp_admin_nav[] = array(
+ 'parent' => 'my-account-' . $this->id,
+ 'id' => 'my-account-' . $this->id . '-personal',
+ 'title' => __( 'Personal', 'buddypress' ),
+ 'href' => trailingslashit( $activity_link )
+ );
+
</ins><span class="cx"> // Mentions
</span><span class="cx"> if ( bp_activity_do_mentions() ) {
</span><span class="cx"> $wp_admin_nav[] = array(
</span><span class="lines">@@ -279,14 +287,6 @@
</span><span class="cx"> );
</span><span class="cx"> }
</span><span class="cx">
</span><del>- // Personal
- $wp_admin_nav[] = array(
- 'parent' => 'my-account-' . $this->id,
- 'id' => 'my-account-' . $this->id . '-personal',
- 'title' => __( 'Personal', 'buddypress' ),
- 'href' => trailingslashit( $activity_link )
- );
-
</del><span class="cx"> // Favorites
</span><span class="cx"> $wp_admin_nav[] = array(
</span><span class="cx"> 'parent' => 'my-account-' . $this->id,
</span></span></pre></div>
<a id="trunkbpxprofilebpxprofileloaderphp"></a>
<div class="modfile"><h4>Modified: trunk/bp-xprofile/bp-xprofile-loader.php (8276 => 8277)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/bp-xprofile/bp-xprofile-loader.php 2014-04-15 21:37:51 UTC (rev 8276)
+++ trunk/bp-xprofile/bp-xprofile-loader.php 2014-04-16 14:13:53 UTC (rev 8277)
</span><span class="lines">@@ -44,6 +44,8 @@
</span><span class="cx"> 'adminbar_myaccount_order' => 20
</span><span class="cx"> )
</span><span class="cx"> );
</span><ins>+
+ $this->setup_hooks();
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> /**
</span><span class="lines">@@ -282,26 +284,21 @@
</span><span class="cx"> );
</span><span class="cx"> }
</span><span class="cx">
</span><del>- // Privacy Settings
- if ( bp_is_active( 'settings' ) ) {
-
- // Setup the logged in user variables
- $settings_link = trailingslashit( bp_loggedin_user_domain() . bp_get_settings_slug() );
-
- // Add main Settings menu
- $wp_admin_nav[] = array(
- 'parent' => 'my-account-' . $bp->settings->id,
- 'id' => 'my-account-' . $bp->settings->id . '-profile',
- 'title' => __( 'Profile', 'buddypress' ),
- 'href' => trailingslashit( $settings_link . 'profile' )
- );
- }
</del><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> parent::setup_admin_bar( $wp_admin_nav );
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> /**
</span><ins>+ * Add custom hooks.
+ *
+ * @since BuddyPress (2.0.0)
+ */
+ public function setup_hooks() {
+ add_filter( 'bp_settings_admin_nav', array( $this, 'setup_settings_admin_nav' ), 2 );
+ }
+
+ /**
</ins><span class="cx"> * Sets up the title for pages and <title>
</span><span class="cx"> */
</span><span class="cx"> public function setup_title() {
</span><span class="lines">@@ -322,6 +319,29 @@
</span><span class="cx">
</span><span class="cx"> parent::setup_title();
</span><span class="cx"> }
</span><ins>+
+ /**
+ * Adds "Settings > Profile" subnav item under the "Settings" adminbar menu.
+ *
+ * @since BuddyPress (2.0.0)
+ *
+ * @param array $wp_admin_nav The settings adminbar nav array.
+ * @return array
+ */
+ public function setup_settings_admin_nav( $wp_admin_nav ) {
+ // Setup the logged in user variables
+ $settings_link = trailingslashit( bp_loggedin_user_domain() . bp_get_settings_slug() );
+
+ // Add the "Profile" subnav item
+ $wp_admin_nav[] = array(
+ 'parent' => 'my-account-' . buddypress()->settings->id,
+ 'id' => 'my-account-' . buddypress()->settings->id . '-profile',
+ 'title' => __( 'Profile', 'buddypress' ),
+ 'href' => trailingslashit( $settings_link . 'profile' )
+ );
+
+ return $wp_admin_nav;
+ }
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> function bp_setup_xprofile() {
</span></span></pre>
</div>
</div>
</body>
</html>