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

Timestamp:

06/11/2015 06:53:59 AM (9 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-settings/bp-settings-loader.php (modified) (10 diffs)

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

@@ -31 +31 @@
     /**
      * Include files
-     *
-     * @global BuddyPress $bp The one true BuddyPress instance
      */
     public function includes( $includes = array() ) {
@@ -54 +52 @@
 
         // Define a slug, if necessary
-        if ( !defined( 'BP_SETTINGS_SLUG' ) )
+        if ( ! defined( 'BP_SETTINGS_SLUG' ) ) {
             define( 'BP_SETTINGS_SLUG', $this->id );
+        }
 
         // All globals for settings component.
@@ -68 +67 @@
      */
     public function setup_nav( $main_nav = array(), $sub_nav = array() ) {
-
-        // Add the settings navigation item
-        $main_nav = array(
-            'name'                    => __( 'Settings', 'buddypress' ),
-            'slug'                    => $this->slug,
-            'position'                => 100,
-            'show_for_displayed_user' => bp_core_can_edit_settings(),
-            'screen_function'         => 'bp_settings_screen_general',
-            'default_subnav_slug'     => 'general'
-        );
 
         // Determine user to use
@@ -88 +77 @@
         }
 
-        $settings_link = trailingslashit( $user_domain . $this->slug );
+        $access        = bp_core_can_edit_settings();
+        $slug          = bp_get_settings_slug();
+        $settings_link = trailingslashit( $user_domain . $slug );
+
+        // Add the settings navigation item
+        $main_nav = array(
+            'name'                    => __( 'Settings', 'buddypress' ),
+            'slug'                    => $slug,
+            'position'                => 100,
+            'show_for_displayed_user' => $access,
+            'screen_function'         => 'bp_settings_screen_general',
+            'default_subnav_slug'     => 'general'
+        );
 
         // Add General Settings nav item
@@ -95 +96 @@
             'slug'            => 'general',
             'parent_url'      => $settings_link,
-            'parent_slug'     => $this->slug,
+            'parent_slug'     => $slug,
             'screen_function' => 'bp_settings_screen_general',
             'position'        => 10,
-            'user_has_access' => bp_core_can_edit_settings()
+            'user_has_access' => $access
         );
 
@@ -107 +108 @@
             'slug'            => 'notifications',
             'parent_url'      => $settings_link,
-            'parent_slug'     => $this->slug,
+            'parent_slug'     => $slug,
             'screen_function' => 'bp_settings_screen_notification',
             'position'        => 20,
-            'user_has_access' => bp_core_can_edit_settings()
+            'user_has_access' => $access
         );
 
@@ -119 +120 @@
                 'slug'            => 'capabilities',
                 'parent_url'      => $settings_link,
-                'parent_slug'     => $this->slug,
+                'parent_slug'     => $slug,
                 'screen_function' => 'bp_settings_screen_capabilities',
                 'position'        => 80,
@@ -132 +133 @@
                 'slug'            => 'delete-account',
                 'parent_url'      => $settings_link,
-                'parent_slug'     => $this->slug,
+                'parent_slug'     => $slug,
                 'screen_function' => 'bp_settings_screen_delete_account',
                 'position'        => 90,
@@ -147 +148 @@
     public function setup_admin_bar( $wp_admin_nav = array() ) {
 
-        // The instance
-        $bp = buddypress();
-
         // Menus for logged in user
         if ( is_user_logged_in() ) {
 
             // Setup the logged in user variables
-            $user_domain   = bp_loggedin_user_domain();
-            $settings_link = trailingslashit( $user_domain . $this->slug );
+            $settings_link = trailingslashit( bp_loggedin_user_domain() . bp_get_settings_slug() );
 
             // Add main Settings menu
             $wp_admin_nav[] = array(
-                'parent' => $bp->my_account_menu_id,
+                'parent' => buddypress()->my_account_menu_id,
                 'id'     => 'my-account-' . $this->id,
                 'title'  => __( 'Settings', 'buddypress' ),
-                'href'   => trailingslashit( $settings_link )
+                'href'   => $settings_link
             );
 
@@ -170 +167 @@
                 'id'     => 'my-account-' . $this->id . '-general',
                 'title'  => __( 'General', 'buddypress' ),
-                'href'   => trailingslashit( $settings_link . 'general' )
+                'href'   => $settings_link
             );