Changeset 9936 for trunk/src/bp-xprofile/bp-xprofile-loader.php

Timestamp:

06/11/2015 06:53:59 AM (11 years ago)

Author:

johnjamesjacoby

Message:

Loaders: Micro-optimizations:

• Add brackets for improved readability
• Only instantiate $bp from buddypress() when used more than once, and after all early return conditions have executed
• Use _slug_ functions where appropriate, and avoid $this->slug references as they do not run filters
• Reduce mulitple calls to the same functions into 1 function call: I.E. bp_core_can_edit_settings()
• Remove BP_Core_Component::setup_nav() method - it's been handled and duplicated by BP_Members_Component for several years now, and only when XProfile is disabled
• Use new bp_get_profile_slug() functions where appropriate
• Use bp_core_number_format() where appropriate
• Avoid duplicate trailingslashit() calls on the same variables
• Rely on canonical menu URLs for all components

This change touches each component's -loader.php file and makes several small optimizations that avoid executing hundreds of function calls that return data (specifically gettext) that never gets used on logged-out users. This results in an approximate 20% reduction in time spent running our full unit test suite in my testing, and also improves site performance for logged-out users.

File:

• trunk/src/bp-xprofile/bp-xprofile-loader.php (modified) (7 diffs)

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

@@ -172 +172 @@
         public function setup_nav( $main_nav = array(), $sub_nav = array() ) {
 
-                $sub_nav = array();
+                // Determine user to use
+                if ( bp_displayed_user_domain() ) {
+                        $user_domain = bp_displayed_user_domain();
+                } elseif ( bp_loggedin_user_domain() ) {
+                        $user_domain = bp_loggedin_user_domain();
+                } else {
+                        return;
+                }
+
+                $slug         = 
+                $profile_link = trailingslashit( $user_domain . $this->slug );
 
                 // Add 'Profile' to the main navigation
@@ -183 +193 @@
                         'item_css_id'         => $this->id
                 );
-
-                // Determine user to use
-                if ( bp_displayed_user_domain() ) {
-                        $user_domain = bp_displayed_user_domain();
-                } elseif ( bp_loggedin_user_domain() ) {
-                        $user_domain = bp_loggedin_user_domain();
-                } else {
-                        return;
-                }
-
-                $profile_link = trailingslashit( $user_domain . $this->slug );
 
                 // Add the subnav items to the profile
@@ -276 +275 @@
          */
         public function setup_admin_bar( $wp_admin_nav = array() ) {
-                $bp = buddypress();
-
-                // Prevent debug notices
-                $wp_admin_nav = array();
 
                 // Menus for logged in user
@@ -285 +280 @@
 
                         // Profile link
-                        $profile_link = trailingslashit( bp_loggedin_user_domain() . $this->slug );
+                        $profile_link = trailingslashit( bp_loggedin_user_domain() . bp_get_profile_slug() );
 
                         // Add the "Profile" sub menu
                         $wp_admin_nav[] = array(
-                                'parent' => $bp->my_account_menu_id,
+                                'parent' => buddypress()->my_account_menu_id,
                                 'id'     => 'my-account-' . $this->id,
                                 'title'  => _x( 'Profile', 'My Account Profile', 'buddypress' ),
-                                'href'   => trailingslashit( $profile_link )
+                                'href'   => $profile_link
                         );
 
@@ -300 +295 @@
                                 'id'     => 'my-account-' . $this->id . '-public',
                                 'title'  => _x( 'View', 'My Account Profile sub nav', 'buddypress' ),
-                                'href'   => trailingslashit( $profile_link . 'public' )
+                                'href'   => $profile_link
                         );
 
@@ -339 +334 @@
          */
         public function setup_title() {
-                $bp = buddypress();
 
                 if ( bp_is_profile_component() ) {
+                        $bp = buddypress();
+
                         if ( bp_is_my_profile() ) {
                                 $bp->bp_options_title = _x( 'My Profile', 'Page title', 'buddypress' );
@@ -384 +380 @@
          */
         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() );