Ticket #7218: 7218.diff

src/bp-activity/classes/class-bp-activity-component.php

@@ -51 +51 @@
                 // Files to include.
                 $includes = array(
                         'cssjs',
-                        'actions',
-                        'screens',
                         'filters',
                         'adminbar',
                         'template',
@@ -85 +83 @@
                 parent::includes( $includes );
         }
 
+        /**
+         * Load screen and action files only when viewing the activity component.
+         *
+         * @since 3.0.0
+         */
+        public function late_includes( $includes = array() ) {
+                if ( ! bp_is_activity_component() ) {
+                        return;
+                }
+
+                parent::late_includes( array(
+                        'actions',
+                        'screens',
+                ) );
+        }
+
         /**
          * Set up component global variables.
          *

src/bp-core/bp-core-actions.php

@@ -96 +96 @@
  * places. This won't always be this way, we promise.
  *                                                           v---Load order
  */
+add_action( 'bp_template_redirect', 'bp_late_includes',      0  );
 add_action( 'bp_template_redirect', 'bp_redirect_canonical', 2  );
 add_action( 'bp_template_redirect', 'bp_actions',            4  );
 add_action( 'bp_template_redirect', 'bp_screens',            6  );

src/bp-core/bp-core-dependency.php

@@ -666 +666 @@
         return apply_filters( 'bp_allowed_themes', $themes );
 }
 
+/**
+ * Fires the 'bp_late_includes' hook for including late-loading files.
+ *
+ * @since 3.0.0
+ */
+function bp_late_includes() {
+        /**
+         * Fires just before BP runs its controller functions.
+         *
+         * @since 3.0.0
+         */
+        do_action( 'bp_late_includes' );
+}
+
 /** Requests ******************************************************************/
 
 /**

src/bp-core/classes/class-bp-component.php

@@ -353 +353 @@
          *                        to be parsed and then included.
          */
         public function includes( $includes = array() ) {
-
-                // Bail if no files to include.
-                if ( ! empty( $includes ) ) {
-                        $slashed_path = trailingslashit( $this->path );
-
-                        // Loop through files to be included.
-                        foreach ( (array) $includes as $file ) {
-
-                                $paths = array(
-
-                                        // Passed with no extension.
-                                        'bp-' . $this->id . '/bp-' . $this->id . '-' . $file  . '.php',
-                                        'bp-' . $this->id . '-' . $file . '.php',
-                                        'bp-' . $this->id . '/' . $file . '.php',
-
-                                        // Passed with extension.
-                                        $file,
-                                        'bp-' . $this->id . '-' . $file,
-                                        'bp-' . $this->id . '/' . $file,
-                                );
-
-                                foreach ( $paths as $path ) {
-                                        if ( @is_file( $slashed_path . $path ) ) {
-                                                require( $slashed_path . $path );
-                                                break;
-                                        }
-                                }
-                        }
-                }
+                $this->perform_includes( $includes );
 
                 /**
                  * Fires at the end of the includes method inside BP_Component.
@@ -393 +365 @@
                 do_action( 'bp_' . $this->id . '_includes' );
         }
 
+        /**
+         * Performs late includes.
+         *
+         * @since 3.0.0
+         *
+         * @param array See BP_Component::includes().
+         */
+        public function late_includes( $includes = array() ) {
+                $this->perform_includes( $includes );
+        }
+
         /**
          * Set up the actions.
          *
@@ -414 +397 @@
                 // extending this base class.
                 add_action( 'bp_include',                array( $this, 'includes'               ), 8 );
 
+                // Use this hook to load files that only need to be present for screen/actions.
+                add_action( 'bp_late_includes',          array( $this, 'late_includes'          ) );
+
                 // Setup navigation.
                 add_action( 'bp_setup_nav',              array( $this, 'setup_nav'              ), 10 );
 
@@ -840 +826 @@
                  */
                 do_action( 'bp_' . $this->id . '_generate_rewrite_rules' );
         }
+
+        protected function perform_includes( $includes = array() ) {
+                // Bail if no files to include.
+                if ( ! empty( $includes ) ) {
+                        $slashed_path = trailingslashit( $this->path );
+
+                        // Loop through files to be included.
+                        foreach ( (array) $includes as $file ) {
+
+                                $paths = array(
+
+                                        // Passed with no extension.
+                                        'bp-' . $this->id . '/bp-' . $this->id . '-' . $file  . '.php',
+                                        'bp-' . $this->id . '-' . $file . '.php',
+                                        'bp-' . $this->id . '/' . $file . '.php',
+
+                                        // Passed with extension.
+                                        $file,
+                                        'bp-' . $this->id . '-' . $file,
+                                        'bp-' . $this->id . '/' . $file,
+                                );
+
+                                foreach ( $paths as $path ) {
+                                        if ( @is_file( $slashed_path . $path ) ) {
+                                                require( $slashed_path . $path );
+                                                break;
+                                        }
+                                }
+                        }
+                }
+        }
 }
 endif; // BP_Component.