Changeset 9936 for trunk/src/bp-friends/bp-friends-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-friends/bp-friends-loader.php (modified) (10 diffs)

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

@@ -76 +76 @@
 
                 // Define a slug, if necessary
-                if ( !defined( 'BP_FRIENDS_SLUG' ) )
+                if ( ! defined( 'BP_FRIENDS_SLUG' ) ) {
                         define( 'BP_FRIENDS_SLUG', $this->id );
+                }
 
                 // Global tables for the friends component
@@ -111 +112 @@
          */
         public function setup_nav( $main_nav = array(), $sub_nav = array() ) {
-                $bp = buddypress();
-
-                // Add 'Friends' to the main navigation
-                $count    = friends_get_total_friend_count();
-                $class    = ( 0 === $count ) ? 'no-count' : 'count';
-                $main_nav = array(
-                        'name'                => sprintf( __( 'Friends <span class="%s">%s</span>', 'buddypress' ), esc_attr( $class ), number_format_i18n( $count ) ),
-                        'slug'                => $this->slug,
-                        'position'            => 60,
-                        'screen_function'     => 'friends_screen_my_friends',
-                        'default_subnav_slug' => 'my-friends',
-                        'item_css_id'         => $bp->friends->id
-                );
 
                 // Determine user to use
@@ -134 +122 @@
                 }
 
-                $friends_link = trailingslashit( $user_domain . bp_get_friends_slug() );
+                $access       = bp_core_can_edit_settings();
+                $slug         = bp_get_friends_slug();
+                $friends_link = trailingslashit( $user_domain . $slug );
+
+                // Add 'Friends' to the main navigation
+                $count    = friends_get_total_friend_count();
+                $class    = ( 0 === $count ) ? 'no-count' : 'count';
+                $main_nav = array(
+                        'name'                => sprintf( __( 'Friends <span class="%s">%s</span>', 'buddypress' ), esc_attr( $class ), bp_core_number_format( $count ) ),
+                        'slug'                => $slug,
+                        'position'            => 60,
+                        'screen_function'     => 'friends_screen_my_friends',
+                        'default_subnav_slug' => 'my-friends',
+                        'item_css_id'         => $this->id
+                );
 
                 // Add the subnav items to the friends nav item
@@ -141 +143 @@
                         'slug'            => 'my-friends',
                         'parent_url'      => $friends_link,
-                        'parent_slug'     => bp_get_friends_slug(),
+                        'parent_slug'     => $slug,
                         'screen_function' => 'friends_screen_my_friends',
                         'position'        => 10,
@@ -151 +153 @@
                         'slug'            => 'requests',
                         'parent_url'      => $friends_link,
-                        'parent_slug'     => bp_get_friends_slug(),
+                        'parent_slug'     => $slug,
                         'screen_function' => 'friends_screen_requests',
                         'position'        => 20,
-                        'user_has_access' => bp_core_can_edit_settings()
+                        'user_has_access' => $access
                 );
 
@@ -171 +173 @@
          */
         public function setup_admin_bar( $wp_admin_nav = array() ) {
-                $bp = buddypress();
 
                 // Menus for logged in user
@@ -177 +178 @@
 
                         // Setup the logged in user variables
-                        $user_domain  = bp_loggedin_user_domain();
-                        $friends_link = trailingslashit( $user_domain . $this->slug );
+                        $friends_link = trailingslashit( bp_loggedin_user_domain() . bp_get_friends_slug() );
 
                         // Pending friend requests
                         $count = count( friends_get_friendship_request_user_ids( bp_loggedin_user_id() ) );
                         if ( !empty( $count ) ) {
-                                $title   = sprintf( _x( 'Friends <span class="count">%s</span>', 'My Account Friends menu', 'buddypress' ), number_format_i18n( $count ) );
-                                $pending = sprintf( _x( 'Pending Requests <span class="count">%s</span>', 'My Account Friends menu sub nav', 'buddypress' ), number_format_i18n( $count ) );
+                                $title   = sprintf( _x( 'Friends <span class="count">%s</span>',          'My Account Friends menu',         'buddypress' ), bp_core_number_format( $count ) );
+                                $pending = sprintf( _x( 'Pending Requests <span class="count">%s</span>', 'My Account Friends menu sub nav', 'buddypress' ), bp_core_number_format( $count ) );
                         } else {
-                                $title   = _x( 'Friends', 'My Account Friends menu', 'buddypress' );
+                                $title   = _x( 'Friends',            'My Account Friends menu',         'buddypress' );
                                 $pending = _x( 'No Pending Requests','My Account Friends menu sub nav', 'buddypress' );
                         }
@@ -192 +192 @@
                         // Add the "My Account" sub menus
                         $wp_admin_nav[] = array(
-                                'parent' => $bp->my_account_menu_id,
+                                'parent' => buddypress()->my_account_menu_id,
                                 'id'     => 'my-account-' . $this->id,
                                 'title'  => $title,
-                                'href'   => trailingslashit( $friends_link )
+                                'href'   => $friends_link
                         );
 
@@ -203 +203 @@
                                 'id'     => 'my-account-' . $this->id . '-friendships',
                                 'title'  => _x( 'Friendships', 'My Account Friends menu sub nav', 'buddypress' ),
-                                'href'   => trailingslashit( $friends_link )
+                                'href'   => $friends_link
                         );
 
@@ -222 +222 @@
          */
         public function setup_title() {
-                $bp = buddypress();
 
                 // Adjust title
                 if ( bp_is_friends_component() ) {
+                        $bp = buddypress();
+
                         if ( bp_is_my_profile() ) {
                                 $bp->bp_options_title = __( 'Friendships', 'buddypress' );