Changeset 11934

Timestamp:

04/02/2018 06:15:37 PM (7 years ago)

Author:

r-a-y

Message:

Blogs: Conditionally load action and screen functions.

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

See #7218.

Location:

trunk

Files:

• src/bp-blogs/actions (added)
• src/bp-blogs/actions/random.php (moved) (moved from trunk/src/bp-blogs/bp-blogs-actions.php) (1 diff)
• src/bp-blogs/bp-blogs-screens.php (deleted)
• src/bp-blogs/classes/class-bp-blogs-component.php (modified) (2 diffs)
• src/bp-blogs/screens (added)
• src/bp-blogs/screens/create.php (added)
• src/bp-blogs/screens/directory.php (added)
• src/bp-blogs/screens/my-blogs.php (added)
• tests/phpunit/includes/loader.php (modified) (1 diff)

trunk/src/bp-blogs/actions/random.php

@@ -1 +1 @@
 <?php
 /**
- * BuddyPress Blogs Actions.
+ * Blogs: Random blog action handler
  *
  * @package BuddyPress
  * @subpackage BlogsActions
- * @since 1.5.0
+ * @since 3.0.0
  */
-
-// Exit if accessed directly.
-defined( 'ABSPATH' ) || exit;
 
 /**

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

@@ -126 +126 @@
         $includes = array(
             'cache',
-            'actions',
-            'screens',
             'template',
             'filters',
@@ -143 +141 @@
         // Include the files.
         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 blogs page or not multisite.
+        if ( ! bp_is_blogs_component() || ! is_multisite() ) {
+            return;
+        }
+
+        // Actions.
+        if ( isset( $_GET['random-blog'] ) ) {
+            require $this->path . 'bp-blogs/actions/random.php';
+        }
+
+        // Screens.
+        if ( bp_is_user() ) {
+            require $this->path . 'bp-blogs/screens/my-blogs.php';
+        } else {
+            if ( bp_is_blogs_directory() ) {
+                require $this->path . 'bp-blogs/screens/directory.php';
+            }
+
+            if ( is_user_logged_in() && bp_is_current_action( 'create' ) ) {
+                require $this->path . 'bp-blogs/screens/create.php';
+            }
+
+            // Theme compatibility.
+            new BP_Blogs_Theme_Compat();
+        }
     }
 

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', 'notifications', 'settings', 'xprofile' );
+$components = array( 'activity', 'blogs', 'friends', 'groups', 'members', 'messages', 'notifications', 'settings', 'xprofile' );
 foreach ( $components as $component ) {
     add_action( "bp_{$component}_includes", function() use ( $component ) {