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

Timestamp:

06/02/2023 02:05:08 AM (3 years 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-messages/classes/class-bp-messages-component.php (modified) (5 diffs)

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

@@ -98 +98 @@
                                 in_array( bp_current_action(), array( 'compose', 'notices', 'view' ), true )
                         ) {
-                                require $this->path . 'bp-messages/actions/' . bp_current_action() . '.php';
+                                require_once $this->path . 'bp-messages/actions/' . bp_current_action() . '.php';
                         }
 
@@ -105 +105 @@
                                 in_array( bp_action_variable( 0 ), array( 'delete', 'read', 'unread', 'bulk-manage', 'bulk-delete', 'exit' ), true )
                         ) {
-                                require $this->path . 'bp-messages/actions/' . bp_action_variable( 0 ) . '.php';
+                                require_once $this->path . 'bp-messages/actions/' . bp_action_variable( 0 ) . '.php';
                         }
 
@@ -112 +112 @@
                                 // Single action.
                                 if ( in_array( bp_current_action(), array( 'star', 'unstar' ), true ) ) {
-                                        require $this->path . 'bp-messages/actions/star.php';
+                                        require_once $this->path . 'bp-messages/actions/star.php';
                                 }
 
                                 // Bulk-manage.
                                 if ( bp_is_action_variable( 'bulk-manage' ) ) {
-                                        require $this->path . 'bp-messages/actions/bulk-manage-star.php';
+                                        require_once $this->path . 'bp-messages/actions/bulk-manage-star.php';
                                 }
                         }
@@ -123 +123 @@
                         // Screens - User profile integration.
                         if ( bp_is_user() ) {
-                                require $this->path . 'bp-messages/screens/inbox.php';
+                                require_once $this->path . 'bp-messages/screens/inbox.php';
 
                                 /*
@@ -131 +131 @@
                                  */
                                 if ( bp_is_user_messages() && in_array( bp_current_action(), array( 'sentbox', 'compose', 'notices', 'view' ), true ) ) {
-                                        require $this->path . 'bp-messages/screens/' . bp_current_action() . '.php';
+                                        require_once $this->path . 'bp-messages/screens/' . bp_current_action() . '.php';
                                 }
 
                                 // Nav item - Starred.
                                 if ( bp_is_active( $this->id, 'star' ) && bp_is_current_action( bp_get_messages_starred_slug() ) ) {
-                                        require $this->path . 'bp-messages/screens/starred.php';
+                                        require_once $this->path . 'bp-messages/screens/starred.php';
                                 }
                         }