Changeset 11933

Timestamp:

04/02/2018 05:35:08 PM (8 years ago)

Author:

r-a-y

Message:

Notifications: Conditionally load action and screen functions.

This commit conditionally loads action and screen function code for the
Notifications 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 a BuddyPress notifications page. Now, we only load
this code when needed.

This commit also moves over the unused bp_notifications_screen_settings()
function from bp-notifications-screens.php to
bp-notifications-functions.php. This function is a candidate for future
deprecation.

See #7218.

Location:

trunk

Files:

• src/bp-notifications/actions (added)
• src/bp-notifications/actions/bulk-manage.php (added)
• src/bp-notifications/actions/delete.php (added)
• src/bp-notifications/bp-notifications-actions.php (deleted)
• src/bp-notifications/bp-notifications-functions.php (modified) (1 diff)
• src/bp-notifications/bp-notifications-screens.php (deleted)
• src/bp-notifications/classes/class-bp-notifications-component.php (modified) (2 diffs)
• src/bp-notifications/screens (added)
• src/bp-notifications/screens/read.php (added)
• src/bp-notifications/screens/unread.php (added)
• tests/phpunit/includes/loader.php (modified) (1 diff)

trunk/src/bp-notifications/bp-notifications-functions.php

@@ -662 +662 @@
 }
 
+/**
+ * Catch and route the 'settings' notifications screen.
+ *
+ * This is currently unused.
+ *
+ * @since 1.9.0
+ */
+function bp_notifications_screen_settings() {}
+
 /** Meta **********************************************************************/
 

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

@@ -45 +45 @@
         public function includes( $includes = array() ) {
                 $includes = array(
-                        'actions',
-                        'screens',
                         'adminbar',
                         'template',
@@ -54 +52 @@
 
                 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;
+                }
+
+                // Bail if not on a notifications page or logged in.
+                if ( ! bp_is_user_notifications() || ! is_user_logged_in() ) {
+                        return;
+                }
+
+                // Actions.
+                if ( bp_is_post_request() ) {
+                        require $this->path . 'bp-notifications/actions/bulk-manage.php';
+                } elseif ( bp_is_get_request() ) {
+                        require $this->path . 'bp-notifications/actions/delete.php';
+                }
+
+                // Screens.
+                require $this->path . 'bp-notifications/screens/unread.php';
+                if ( bp_is_current_action( 'read' ) ) {
+                        require $this->path . 'bp-notifications/screens/read.php';
+                }
         }
 

trunk/tests/phpunit/includes/loader.php

@@ -24 +24 @@
  * loaded at the same time to prevent weird load order issues.
  */
-$components = array( 'activity', 'friends', 'groups', 'members', 'messages', 'settings', 'xprofile' );
+$components = array( 'activity', 'friends', 'groups', 'members', 'messages', 'notifications', 'settings', 'xprofile' );
 foreach ( $components as $component ) {
         add_action( "bp_{$component}_includes", function() use ( $component ) {