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

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

@@ -151 +151 @@
         public function includes( $includes = array() ) {
 
-                if ( !is_admin() )
+                if ( ! is_admin() ) {
                         return;
+                }
 
                 $includes = array(
@@ -179 +180 @@
 
                 // Get the base database prefix
-                if ( empty( $bp->table_prefix ) )
+                if ( empty( $bp->table_prefix ) ) {
                         $bp->table_prefix = bp_core_get_table_prefix();
+                }
 
                 // The domain for the root of the site where the main blog resides
-                if ( empty( $bp->root_domain ) )
+                if ( empty( $bp->root_domain ) ) {
                         $bp->root_domain = bp_core_get_root_domain();
+                }
 
                 // Fetches all of the core BuddyPress settings in one fell swoop
-                if ( empty( $bp->site_options ) )
+                if ( empty( $bp->site_options ) ) {
                         $bp->site_options = bp_core_get_root_options();
+                }
 
                 // The names of the core WordPress pages used to display BuddyPress content
-                if ( empty( $bp->pages ) )
+                if ( empty( $bp->pages ) ) {
                         $bp->pages = bp_core_get_directory_pages();
+                }
 
                 /** Basic current user data *******************************************/
@@ -261 +266 @@
 
         /**
-         * Set up component navigation.
-         *
-         * @since BuddyPress (1.5.0)
-         *
-         * @see BP_Component::setup_nav() for a description of arguments.
-         *
-         * @param array $main_nav Optional. See BP_Component::setup_nav() for
-         *        description.
-         * @param array $sub_nav Optional. See BP_Component::setup_nav() for
-         *        description.
-         */
-        public function setup_nav( $main_nav = array(), $sub_nav = array() ) {
-                $bp = buddypress();
-
-                 // If xprofile component is disabled, revert to WordPress profile
-                if ( !bp_is_active( 'xprofile' ) ) {
-
-                        // Fallback values if xprofile is disabled
-                        if ( ! isset( $bp->core->profile ) ) {
-                                $bp->core->profile = new stdClass;
-                        }
-                        $bp->core->profile->slug = 'profile';
-                        $bp->active_components[$bp->core->profile->slug] = $bp->core->profile->slug;
-
-                        // Add 'Profile' to the main navigation
-                        $main_nav = array(
-                                'name'                => _x( 'Profile', 'Main navigation', 'buddypress' ),
-                                'slug'                => $bp->core->profile->slug,
-                                'position'            => 20,
-                                'screen_function'     => 'bp_core_catch_profile_uri',
-                                'default_subnav_slug' => 'public'
-                        );
-
-                        $profile_link = trailingslashit( bp_loggedin_user_domain() . '/' . $bp->core->profile->slug );
-
-                        // Add the subnav items to the profile
-                        $sub_nav[] = array(
-                                'name'            => _x( 'View', 'Profile sub nav', 'buddypress' ),
-                                'slug'            => 'public',
-                                'parent_url'      => $profile_link,
-                                'parent_slug'     => $bp->core->profile->slug,
-                                'screen_function' => 'bp_core_catch_profile_uri'
-                        );
-
-                        parent::setup_nav( $main_nav, $sub_nav );
-                }
-        }
-
-        /**
          * Setup cache groups
          *