Changeset 11885

Timestamp:

03/05/2018 12:00:25 AM (8 years ago)

Author:

r-a-y

Message:

Activity: Conditionally load action and screen functions.

This commit conditionally loads action and screen function code for the
Activity component, utilizing the 'bp_late_include' hook introduced in
r11884.

Previously, we loaded these functions at all times, which is unnecessary
when a user is not on an BuddyPress activity page. Now, we only load this
code when needed.

A special case is required for PHPUnit as PHPUnit doesn't like conditional-
included files when running multiple unit tests. So for PHPUnit, we
include all action and screen code at once, just like before.

See #7218.

Location:

trunk

Files:

• src/bp-activity/actions (added)
• src/bp-activity/actions/delete.php (added)
• src/bp-activity/actions/favorite.php (added)
• src/bp-activity/actions/feeds.php (added)
• src/bp-activity/actions/post.php (added)
• src/bp-activity/actions/reply.php (added)
• src/bp-activity/actions/spam.php (added)
• src/bp-activity/actions/unfavorite.php (added)
• src/bp-activity/bp-activity-actions.php (deleted)
• src/bp-activity/bp-activity-screens.php (deleted)
• src/bp-activity/classes/class-bp-activity-component.php (modified) (2 diffs)
• src/bp-activity/screens (added)
• src/bp-activity/screens/directory.php (added)
• src/bp-activity/screens/favorites.php (added)
• src/bp-activity/screens/friends.php (added)
• src/bp-activity/screens/groups.php (added)
• src/bp-activity/screens/just-me.php (added)
• src/bp-activity/screens/mentions.php (added)
• src/bp-activity/screens/permalink.php (added)
• src/bp-activity/screens/settings-email.php (added)
• tests/phpunit/includes/loader.php (modified) (1 diff)

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

@@ -52 +52 @@
                 $includes = array(
                         'cssjs',
-                        'actions',
-                        'screens',
                         'filters',
                         'adminbar',
@@ -84 +82 @@
 
                 parent::includes( $includes );
+        }
+
+        /**
+         * Late includes method.
+         *
+         * Only load up certain code when on specific pages.
+         *
+         * @since 3.0.0
+         */
+        public function late_includes() {
+                // Bail if PHPUnit is running.
+                if ( defined( 'BP_TESTS_DIR' ) ) {
+                        return;
+                }
+
+                /*
+                 * Load activity action and screen code if PHPUnit isn't running.
+                 *
+                 * For PHPUnit, we load these files in tests/phpunit/includes/install.php.
+                 */
+                if ( bp_is_current_component( 'activity' ) ) {
+                        // Authenticated actions - Only fires when JS is disabled.
+                        if ( is_user_logged_in() &&
+                                in_array( bp_current_action(), array( 'delete', 'spam', 'post', 'reply', 'favorite', 'unfavorite' ), true )
+                        ) {
+                                require $this->path . 'bp-activity/actions/' . bp_current_action() . '.php';
+                        }
+
+                        // RSS feeds.
+                        if ( bp_is_current_action( 'feed' ) || bp_is_action_variable( 'feed', 0 ) ) {
+                                require $this->path . 'bp-activity/actions/feeds.php';
+                        }
+
+                        // Screens - Directory.
+                        if ( bp_is_activity_directory() ) {
+                                require $this->path . 'bp-activity/screens/directory.php';
+                        }
+
+                        // Screens - User main nav.
+                        if ( bp_is_user() ) {
+                                require $this->path . 'bp-activity/screens/just-me.php';
+                        }
+
+                        // Screens - User secondary nav.
+                        if ( bp_is_user() && in_array( bp_current_action(), array( 'friends', 'groups', 'favorites', 'mentions' ), true ) ) {
+                                require $this->path . 'bp-activity/screens/' . bp_current_action() . '.php';
+                        }
+
+                        // Screens - Single permalink.
+                        if ( bp_is_current_action( 'p' ) || is_numeric( bp_current_action() ) ) {
+                                require $this->path . 'bp-activity/screens/permalink.php';
+                        }
+
+                        // Theme compatibility.
+                        new BP_Activity_Theme_Compat();
+                }
+
+                // Activity notifications HTML table.
+                if ( bp_is_user_settings_notifications() ) {
+                        require $this->path . 'bp-activity/screens/settings-email.php';
+                }
         }
 

trunk/tests/phpunit/includes/loader.php

@@ -17 +17 @@
 }
 tests_add_filter( 'bp_send_email_delivery_class', '_bp_mock_mailer' );
+
+/**
+ * Load up activity action and screen code.
+ *
+ * In BuddyPress, this is loaded conditionally, but PHPUnit needs all files
+ * loaded at the same time to prevent weird load order issues.
+ */
+add_action( 'bp_activity_includes', function() {
+        $dirs = array(
+                buddypress()->plugin_dir . 'bp-activity/actions/',
+                buddypress()->plugin_dir . 'bp-activity/screens/',
+        );
+
+        foreach ( $dirs as $dir ) {
+                foreach ( glob( $dir . "*.php" ) as $file ) {
+                        require $file;
+                }
+        }
+} );