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

Timestamp:

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

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

@@ -68 +68 @@
 
         // Define a slug, if necessary
-        if ( !defined( 'BP_NOTIFICATIONS_SLUG' ) ) {
+        if ( ! defined( 'BP_NOTIFICATIONS_SLUG' ) ) {
             define( 'BP_NOTIFICATIONS_SLUG', $this->id );
         }
@@ -104 +104 @@
     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_notifications_get_unread_notification_count( bp_displayed_user_id() );
-            $class    = ( 0 === $count ) ? 'no-count' : 'count';
-            $nav_name = sprintf( _x( 'Notifications <span class="%s">%s</span>', 'Profile screen nav', 'buddypress' ), esc_attr( $class ), number_format_i18n( $count ) );
-        } else {
-            $nav_name = _x( 'Notifications', 'Profile screen nav', 'buddypress' );
-        }
-
-        // Add 'Notifications' to the main navigation
-        $main_nav = array(
-            'name'                    => $nav_name,
-            'slug'                    => $this->slug,
-            'position'                => 30,
-            'show_for_displayed_user' => bp_core_can_edit_settings(),
-            'screen_function'         => 'bp_notifications_screen_unread',
-            'default_subnav_slug'     => 'unread',
-            'item_css_id'             => $this->id,
-        );
-
         // Determine user to use
         if ( bp_displayed_user_domain() ) {
@@ -133 +113 @@
         }
 
-        $notifications_link = trailingslashit( $user_domain . bp_get_notifications_slug() );
+        $access             = bp_core_can_edit_settings();
+        $slug               = bp_get_notifications_slug();
+        $notifications_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_notifications_get_unread_notification_count( bp_displayed_user_id() );
+            $class    = ( 0 === $count ) ? 'no-count' : 'count';
+            $nav_name = sprintf( _x( 'Notifications <span class="%s">%s</span>', 'Profile screen nav', 'buddypress' ), esc_attr( $class ), bp_core_number_format( $count ) );
+        } else {
+            $nav_name = _x( 'Notifications', 'Profile screen nav', 'buddypress' );
+        }
+
+        // Add 'Notifications' to the main navigation
+        $main_nav = array(
+            'name'                    => $nav_name,
+            'slug'                    => $slug,
+            'position'                => 30,
+            'show_for_displayed_user' => $access,
+            'screen_function'         => 'bp_notifications_screen_unread',
+            'default_subnav_slug'     => 'unread',
+            'item_css_id'             => $this->id,
+        );
 
         // Add the subnav items to the notifications nav item
@@ -140 +142 @@
             'slug'            => 'unread',
             'parent_url'      => $notifications_link,
-            'parent_slug'     => bp_get_notifications_slug(),
+            'parent_slug'     => $slug,
             'screen_function' => 'bp_notifications_screen_unread',
             'position'        => 10,
             'item_css_id'     => 'notifications-my-notifications',
-            'user_has_access' => bp_core_can_edit_settings(),
+            'user_has_access' => $access,
         );
 
@@ -151 +153 @@
             'slug'            => 'read',
             'parent_url'      => $notifications_link,
-            'parent_slug'     => bp_get_notifications_slug(),
+            'parent_slug'     => $slug,
             'screen_function' => 'bp_notifications_screen_read',
             'position'        => 20,
-            'user_has_access' => bp_core_can_edit_settings(),
+            'user_has_access' => $access,
         );
 
@@ -177 +179 @@
 
             // Setup the logged in user variables
-            $notifications_link = trailingslashit( bp_loggedin_user_domain() . $this->slug );
+            $notifications_link = trailingslashit( bp_loggedin_user_domain() . bp_get_notifications_slug() );
 
             // Pending notification requests
             $count = bp_notifications_get_unread_notification_count( bp_loggedin_user_id() );
             if ( ! empty( $count ) ) {
-                $title  = sprintf( _x( 'Notifications <span class="count">%s</span>', 'My Account Notification pending', 'buddypress' ), number_format_i18n( $count ) );
-                $unread = sprintf( _x( 'Unread <span class="count">%s</span>', 'My Account Notification pending', 'buddypress' ), number_format_i18n( $count ) );
+                $title  = sprintf( _x( 'Notifications <span class="count">%s</span>', 'My Account Notification pending', 'buddypress' ), bp_core_number_format( $count ) );
+                $unread = sprintf( _x( 'Unread <span class="count">%s</span>',        'My Account Notification pending', 'buddypress' ), bp_core_number_format( $count ) );
             } else {
-                $title  = _x( 'Notifications', 'My Account Notification', 'buddypress' );
-                $unread = _x( 'Unread', 'My Account Notification sub nav', 'buddypress' );
+                $title  = _x( 'Notifications', 'My Account Notification',         'buddypress' );
+                $unread = _x( 'Unread',        'My Account Notification sub nav', 'buddypress' );
             }
 
@@ -194 +196 @@
                 'id'     => 'my-account-' . $this->id,
                 'title'  => $title,
-                'href'   => trailingslashit( $notifications_link ),
+                'href'   => $notifications_link
             );
 
@@ -202 +204 @@
                 'id'     => 'my-account-' . $this->id . '-unread',
                 'title'  => $unread,
-                'href'   => trailingslashit( $notifications_link ),
+                'href'   => $notifications_link
             );
 
@@ -223 +225 @@
      */
     public function setup_title() {
-        $bp = buddypress();
 
         // Adjust title
         if ( bp_is_notifications_component() ) {
+            $bp = buddypress();
+
             if ( bp_is_my_profile() ) {
                 $bp->bp_options_title = __( 'Notifications', 'buddypress' );