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

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

@@ -50 +50 @@
 
                 // Define the parent forum ID
-                if ( !defined( 'BP_FORUMS_PARENT_FORUM_ID' ) )
+                if ( ! defined( 'BP_FORUMS_PARENT_FORUM_ID' ) ) {
                         define( 'BP_FORUMS_PARENT_FORUM_ID', 1 );
+                }
 
                 // Define a slug, if necessary
-                if ( !defined( 'BP_FORUMS_SLUG' ) )
+                if ( ! defined( 'BP_FORUMS_SLUG' ) ) {
                         define( 'BP_FORUMS_SLUG', $this->id );
+                }
 
                 // The location of the bbPress stand-alone config file
                 $bbconfig = bp_core_get_root_option( 'bb-config-location' );
-                if ( '' !== $bbconfig )
+                if ( '' !== $bbconfig ) {
                         $this->bbconfig = $bbconfig;
+                }
 
                 // All globals for messaging component.
@@ -95 +98 @@
 
                 // bbPress stand-alone
-                if ( !defined( 'BB_PATH' ) )
+                if ( ! defined( 'BB_PATH' ) ) {
                         $includes[] = 'bbpress-sa';
+                }
 
                 // Admin-specific code
@@ -122 +126 @@
 
                 // Stop if forums haven't been set up yet
-                if ( !bp_forums_is_installed_correctly() )
+                if ( ! bp_forums_is_installed_correctly() ) {
                         return;
+                }
 
                 // Stop if there is no user displayed or logged in
-                if ( !is_user_logged_in() && !bp_displayed_user_id() )
+                if ( ! is_user_logged_in() && ! bp_displayed_user_id() ) {
                         return;
-
-                // Add 'Forums' to the main navigation
-                $main_nav = array(
-                        'name'                => __( 'Forums', 'buddypress' ),
-                        'slug'                => $this->slug,
-                        'position'            => 80,
-                        'screen_function'     => 'bp_member_forums_screen_topics',
-                        'default_subnav_slug' => 'topics',
-                        'item_css_id'         => $this->id
-                );
+                }
 
                 // Determine user to use
@@ -149 +145 @@
 
                 // User link
-                $forums_link = trailingslashit( $user_domain . $this->slug );
-
-                // Additional menu if friends is active
+                $slug        = bp_get_forums_slug();
+                $forums_link = trailingslashit( $user_domain . $slug );
+
+                // Add 'Forums' to the main navigation
+                $main_nav = array(
+                        'name'                => __( 'Forums', 'buddypress' ),
+                        'slug'                => $slug,
+                        'position'            => 80,
+                        'screen_function'     => 'bp_member_forums_screen_topics',
+                        'default_subnav_slug' => 'topics',
+                        'item_css_id'         => $this->id
+                );
+
+                // Topics started
                 $sub_nav[] = array(
                         'name'            => __( 'Topics Started', 'buddypress' ),
                         'slug'            => 'topics',
                         'parent_url'      => $forums_link,
-                        'parent_slug'     => $this->slug,
+                        'parent_slug'     => $slug,
                         'screen_function' => 'bp_member_forums_screen_topics',
                         'position'        => 20,
@@ -162 +169 @@
                 );
 
-                // Additional menu if friends is active
+                // Topics replied to
                 $sub_nav[] = array(
                         'name'            => __( 'Replied To', 'buddypress' ),
                         'slug'            => 'replies',
                         'parent_url'      => $forums_link,
-                        'parent_slug'     => $this->slug,
+                        'parent_slug'     => $slug,
                         'screen_function' => 'bp_member_forums_screen_replies',
                         'position'        => 40,
@@ -192 +199 @@
 
                         // Setup the logged in user variables
-                        $forums_link = trailingslashit( bp_loggedin_user_domain() . $this->slug );
+                        $forums_link = trailingslashit( bp_loggedin_user_domain() . bp_get_forums_slug() );
 
                         // Add the "My Account" sub menus
@@ -199 +206 @@
                                 'id'     => 'my-account-' . $this->id,
                                 'title'  => __( 'Forums', 'buddypress' ),
-                                'href'   => trailingslashit( $forums_link )
+                                'href'   => $forums_link
                         );
 
@@ -207 +214 @@
                                 'id'     => 'my-account-' . $this->id . '-topics-started',
                                 'title'  => __( 'Topics Started', 'buddypress' ),
-                                'href'   => trailingslashit( $forums_link . 'topics' )
+                                'href'   => $forums_link
                         );
 
@@ -234 +241 @@
          */
         public function setup_title() {
-                $bp = buddypress();
 
                 // Adjust title based on view
                 if ( bp_is_forums_component() ) {
+                        $bp = buddypress();
+
                         if ( bp_is_my_profile() ) {
                                 $bp->bp_options_title = __( 'Forums', 'buddypress' );