Changeset 8277

Timestamp:

04/16/2014 02:13:53 PM (12 years ago)

Author:

boonebgorges

Message:

Proper ordering for Settings subnav items in WP Admin Bar

Fixes #5537

Props r-a-y

Location:

trunk

Files:

• bp-activity/bp-activity-loader.php (modified) (2 diffs)
• bp-xprofile/bp-xprofile-loader.php (modified) (3 diffs)

trunk/bp-activity/bp-activity-loader.php

@@ -270 +270 @@
                         );
 
+                        // Personal
+                        $wp_admin_nav[] = array(
+                                'parent' => 'my-account-' . $this->id,
+                                'id'     => 'my-account-' . $this->id . '-personal',
+                                'title'  => __( 'Personal', 'buddypress' ),
+                                'href'   => trailingslashit( $activity_link )
+                        );
+
                         // Mentions
                         if ( bp_activity_do_mentions() ) {
@@ -279 +287 @@
                                 );
                         }
-
-                        // Personal
-                        $wp_admin_nav[] = array(
-                                'parent' => 'my-account-' . $this->id,
-                                'id'     => 'my-account-' . $this->id . '-personal',
-                                'title'  => __( 'Personal', 'buddypress' ),
-                                'href'   => trailingslashit( $activity_link )
-                        );
 
                         // Favorites

trunk/bp-xprofile/bp-xprofile-loader.php

@@ -45 +45 @@
                         )
                 );
+
+                $this->setup_hooks();
         }
 
@@ -283 +285 @@
                         }
 
-                        // 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' )
-                                );
-                        }
                 }
 
                 parent::setup_admin_bar( $wp_admin_nav );
+        }
+
+        /**
+         * 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 );
         }
 
@@ -323 +320 @@
                 parent::setup_title();
         }
+
+        /**
+         * 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;
+        }
 }