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

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

@@ -91 +91 @@
 
         // Define a slug, if necessary
-        if ( !defined( 'BP_MESSAGES_SLUG' ) ) {
+        if ( ! defined( 'BP_MESSAGES_SLUG' ) ) {
             define( 'BP_MESSAGES_SLUG', $this->id );
         }
@@ -130 +130 @@
     public function setup_nav( $main_nav = array(), $sub_nav = array() ) {
 
-        // Only grab count if we're on a user page and current user has access
-        if ( bp_is_user() && bp_user_has_access() ) {
-            $count    = bp_get_total_unread_messages_count();
-            $class    = ( 0 === $count ) ? 'no-count' : 'count';
-            $nav_name = sprintf( __( 'Messages <span class="%s">%s</span>', 'buddypress' ), esc_attr( $class ), number_format_i18n( $count ) );
-        } else {
-            $nav_name = __( 'Messages', 'buddypress' );
-        }
-
-        // Add 'Messages' to the main navigation
-        $main_nav = array(
-            'name'                    => $nav_name,
-            'slug'                    => $this->slug,
-            'position'                => 50,
-            'show_for_displayed_user' => bp_core_can_edit_settings(),
-            'screen_function'         => 'messages_screen_inbox',
-            'default_subnav_slug'     => 'inbox',
-            'item_css_id'             => $this->id
-        );
-
         // Determine user to use
         if ( bp_displayed_user_domain() ) {
@@ -159 +139 @@
         }
 
-        // Link to user messages
-        $messages_link = trailingslashit( $user_domain . $this->slug );
+        $access        = bp_core_can_edit_settings();
+        $slug          = bp_get_messages_slug();
+        $messages_link = trailingslashit( $user_domain . $slug );
+
+        // Only grab count if we're on a user page and current user has access
+        if ( bp_is_user() && bp_user_has_access() ) {
+            $count    = bp_get_total_unread_messages_count();
+            $class    = ( 0 === $count ) ? 'no-count' : 'count';
+            $nav_name = sprintf( __( 'Messages <span class="%s">%s</span>', 'buddypress' ), esc_attr( $class ), bp_core_number_format( $count ) );
+        } else {
+            $nav_name = __( 'Messages', 'buddypress' );
+        }
+
+        // Add 'Messages' to the main navigation
+        $main_nav = array(
+            'name'                    => $nav_name,
+            'slug'                    => $slug,
+            'position'                => 50,
+            'show_for_displayed_user' => $access,
+            'screen_function'         => 'messages_screen_inbox',
+            'default_subnav_slug'     => 'inbox',
+            'item_css_id'             => $this->id
+        );
 
         // Add the subnav items to the profile
@@ -167 +168 @@
             'slug'            => 'inbox',
             'parent_url'      => $messages_link,
-            'parent_slug'     => $this->slug,
+            'parent_slug'     => $slug,
             'screen_function' => 'messages_screen_inbox',
             'position'        => 10,
-            'user_has_access' => bp_core_can_edit_settings()
+            'user_has_access' => $access
         );
 
@@ -178 +179 @@
                 'slug'            => bp_get_messages_starred_slug(),
                 'parent_url'      => $messages_link,
-                'parent_slug'     => $this->slug,
+                'parent_slug'     => $slug,
                 'screen_function' => 'bp_messages_star_screen',
                 'position'        => 11,
-                'user_has_access' => bp_core_can_edit_settings()
+                'user_has_access' => $access
             );
         }
@@ -189 +190 @@
             'slug'            => 'sentbox',
             'parent_url'      => $messages_link,
-            'parent_slug'     => $this->slug,
+            'parent_slug'     => $slug,
             'screen_function' => 'messages_screen_sentbox',
             'position'        => 20,
-            'user_has_access' => bp_core_can_edit_settings()
+            'user_has_access' => $access
         );
 
@@ -199 +200 @@
             'slug'            => 'compose',
             'parent_url'      => $messages_link,
-            'parent_slug'     => $this->slug,
+            'parent_slug'     => $slug,
             'screen_function' => 'messages_screen_compose',
             'position'        => 30,
-            'user_has_access' => bp_core_can_edit_settings()
+            'user_has_access' => $access
         );
 
@@ -210 +211 @@
                 'slug'            => 'notices',
                 'parent_url'      => $messages_link,
-                'parent_slug'     => $this->slug,
+                'parent_slug'     => $slug,
                 'screen_function' => 'messages_screen_notices',
                 'position'        => 90,
-                'user_has_access' => bp_current_user_can( 'bp_moderate' )
+                'user_has_access' => true
             );
         }
@@ -227 +228 @@
      */
     public function setup_admin_bar( $wp_admin_nav = array() ) {
-        $bp = buddypress();
 
         // Menus for logged in user
@@ -233 +233 @@
 
             // Setup the logged in user variables
-            $user_domain   = bp_loggedin_user_domain();
-            $messages_link = trailingslashit( $user_domain . $this->slug );
+            $messages_link = trailingslashit( bp_loggedin_user_domain() . bp_get_messages_slug() );
 
             // Unread message count
             $count = messages_get_unread_count();
             if ( !empty( $count ) ) {
-                $title = sprintf( __( 'Messages <span class="count">%s</span>', 'buddypress' ), number_format_i18n( $count ) );
-                $inbox = sprintf( __( 'Inbox <span class="count">%s</span>',    'buddypress' ), number_format_i18n( $count ) );
+                $title = sprintf( __( 'Messages <span class="count">%s</span>', 'buddypress' ), bp_core_number_format( $count ) );
+                $inbox = sprintf( __( 'Inbox <span class="count">%s</span>',    'buddypress' ), bp_core_number_format( $count ) );
             } else {
                 $title = __( 'Messages', 'buddypress' );
@@ -248 +247 @@
             // Add main Messages menu
             $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( $messages_link )
+                'href'   => $messages_link
             );
 
@@ -259 +258 @@
                 'id'     => 'my-account-' . $this->id . '-inbox',
                 'title'  => $inbox,
-                'href'   => trailingslashit( $messages_link . 'inbox' )
+                'href'   => $messages_link
             );
 
@@ -306 +305 @@
      */
     public function setup_title() {
-        $bp = buddypress();
 
         if ( bp_is_messages_component() ) {
+            $bp = buddypress();
+
             if ( bp_is_my_profile() ) {
                 $bp->bp_options_title = __( 'My Messages', 'buddypress' );