Changeset 7454

Timestamp:

10/22/2013 07:31:29 PM (12 years ago)

Author:

r-a-y

Message:

Add a fourth parameter to the BP_Component::start() method.

This parameter is an array that allows extended classes to define some
properties that need to be set early one for BP_Component to be able
to work its magic.

Currently accepts 'adminbar_myaccount_order', which sets a custom
position for the component menu generated under the WP Toolbar's
"My Account" menu. If this value isn't set, we set the value to 90,
which will generate the menu before the Settings menu is added.

Fixes #3769.

Location:

trunk

Files:

• bp-activity/bp-activity-loader.php (modified) (1 diff)
• bp-blogs/bp-blogs-loader.php (modified) (1 diff)
• bp-core/bp-core-component.php (modified) (4 diffs)
• bp-forums/bp-forums-loader.php (modified) (1 diff)
• bp-friends/bp-friends-loader.php (modified) (1 diff)
• bp-groups/bp-groups-loader.php (modified) (1 diff)
• bp-members/bp-members-loader.php (modified) (1 diff)
• bp-messages/bp-messages-loader.php (modified) (1 diff)
• bp-settings/bp-settings-loader.php (modified) (1 diff)
• bp-xprofile/bp-xprofile-loader.php (modified) (1 diff)

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

@@ -29 +29 @@
             'activity',
             __( 'Activity Streams', 'buddypress' ),
-            BP_PLUGIN_DIR
+            BP_PLUGIN_DIR,
+            array(
+                'adminbar_myaccount_order' => 10
+            )
         );
     }

trunk/bp-blogs/bp-blogs-loader.php

@@ -24 +24 @@
             'blogs',
             __( 'Site Tracking', 'buddypress' ),
-            BP_PLUGIN_DIR
+            BP_PLUGIN_DIR,
+            array(
+                'adminbar_myaccount_order' => 30
+            )
         );
     }

trunk/bp-core/bp-core-component.php

@@ -115 +115 @@
      * @since BuddyPress (1.5.0)
      *
-     * @uses bp_Component::setup_actions() Set up the hooks and actions.
+     * @uses BP_Component::setup_actions() Set up the hooks and actions.
      *
      * @param string $id Unique ID (for internal identification). Letters,
@@ -123 +123 @@
      * @param string $path The file path for the component's files. Used by
      *        {@link BP_Component::includes()}.
-     */
-    public function start( $id = '', $name = '', $path = '' ) {
+     * @param array $params Additional parameters used by the component.
+     *        The config array supports the following values:
+     *        - 'adminbar_myaccount_order' Sets the position for our
+     *          component menu under the WP Toolbar's "My Account" menu.
+     */
+    public function start( $id = '', $name = '', $path = '', $params = array() ) {
 
         // Internal identifier of component
@@ -134 +138 @@
         // Path for includes
         $this->path = $path;
+
+        // Miscellaneous component parameters that need to be set early on
+        if ( ! empty( $params ) ) {
+            // Sets the position for our menu under the WP Toolbar's "My Account" menu
+            if ( ! empty( $params['adminbar_myaccount_order'] ) ) {
+                $this->adminbar_myaccount_order = (int) $params['adminbar_myaccount_order'];
+            }
+
+        // Set defaults if not passed
+        } else {
+            // new component menus are added before the settings menu if not set
+            $this->adminbar_myaccount_order = 90;
+        }
 
         // Move on to the next step
@@ -305 +322 @@
 
         // Setup WP Toolbar menus
-        add_action( 'bp_setup_admin_bar',        array( $this, 'setup_admin_bar'        ), 10 );
+        add_action( 'bp_setup_admin_bar',        array( $this, 'setup_admin_bar'        ), $this->adminbar_myaccount_order );
 
         // Setup component title

trunk/bp-forums/bp-forums-loader.php

@@ -24 +24 @@
             'forums',
             __( 'Discussion Forums', 'buddypress' ),
-            BP_PLUGIN_DIR
+            BP_PLUGIN_DIR,
+            array(
+                'adminbar_myaccount_order' => 80
+            )
         );
     }

trunk/bp-friends/bp-friends-loader.php

@@ -23 +23 @@
             'friends',
             __( 'Friend Connections', 'buddypress' ),
-            BP_PLUGIN_DIR
+            BP_PLUGIN_DIR,
+            array(
+                'adminbar_myaccount_order' => 60
+            )
         );
     }

trunk/bp-groups/bp-groups-loader.php

@@ -82 +82 @@
             'groups',
             __( 'User Groups', 'buddypress' ),
-            BP_PLUGIN_DIR
+            BP_PLUGIN_DIR,
+            array(
+                'adminbar_myaccount_order' => 70
+            )
         );
     }

trunk/bp-members/bp-members-loader.php

@@ -23 +23 @@
             'members',
             __( 'Members', 'buddypress' ),
-            BP_PLUGIN_DIR
+            BP_PLUGIN_DIR,
+            array(
+                'adminbar_myaccount_order' => 20
+            )
         );
     }

trunk/bp-messages/bp-messages-loader.php

@@ -32 +32 @@
             'messages',
             __( 'Private Messages', 'buddypress' ),
-            BP_PLUGIN_DIR
+            BP_PLUGIN_DIR,
+            array(
+                'adminbar_myaccount_order' => 50
+            )
         );
     }

trunk/bp-settings/bp-settings-loader.php

@@ -22 +22 @@
             'settings',
             __( 'Settings', 'buddypress' ),
-            BP_PLUGIN_DIR
+            BP_PLUGIN_DIR,
+            array(
+                'adminbar_myaccount_order' => 100
+            )
         );
     }

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

@@ -40 +40 @@
             'xprofile',
             __( 'Extended Profiles', 'buddypress' ),
-            BP_PLUGIN_DIR
+            BP_PLUGIN_DIR,
+            array(
+                'adminbar_myaccount_order' => 20
+            )
         );
     }