Changeset 13495 for trunk/src/bp-activity/classes/class-bp-activity-component.php

Timestamp:

06/02/2023 02:05:08 AM (18 months ago)

Author:

imath

Message:

Prevent potential issues with late_includes() in Component classes

Use require_once instead of require to load action & screen files.

See #4954
Fixes #8910
Closes ​https://github.com/buddypress/buddypress/pull/112

File:

• trunk/src/bp-activity/classes/class-bp-activity-component.php (modified) (2 diffs)

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

@@ -122 +122 @@
                 in_array( bp_current_action(), array( 'delete', 'spam', 'post', 'reply', 'favorite', 'unfavorite' ), true )
             ) {
-                require $this->path . 'bp-activity/actions/' . bp_current_action() . '.php';
+                require_once $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';
+                require_once $this->path . 'bp-activity/actions/feeds.php';
             }
 
             // Screens - Directory.
             if ( bp_is_activity_directory() ) {
-                require $this->path . 'bp-activity/screens/directory.php';
+                require_once $this->path . 'bp-activity/screens/directory.php';
             }
 
             // Screens - User main nav.
             if ( bp_is_user() ) {
-                require $this->path . 'bp-activity/screens/just-me.php';
+                require_once $this->path . 'bp-activity/screens/just-me.php';
             }
 
@@ -163 +163 @@
 
             if ( bp_is_user() && isset( $filenames[ $slug ] ) ) {
-                require $this->path . 'bp-activity/screens/' . $filenames[ $slug ] . '.php';
+                require_once $this->path . 'bp-activity/screens/' . $filenames[ $slug ] . '.php';
             }
 
             // Screens - Single permalink.
             if ( bp_is_current_action( 'p' ) || is_numeric( bp_current_action() ) ) {
-                require $this->path . 'bp-activity/screens/permalink.php';
+                require_once $this->path . 'bp-activity/screens/permalink.php';
             }