Changeset 10746

Timestamp:

05/12/2016 06:05:27 PM (8 years ago)

Author:

djpaul

Message:

Core: modify bp_locate_template() to support loading templates in code executed inside the wp-admin scope.

The recent Emails and Avatars changes showed a weakness in the function where we were unable to load BuddyPress templates inside wp-admin because the constants WP_USE_THEMES and DOING_AJAX are falsey. These checks were introduced in r7842 and r7837, seemingly to prevent errors during PHPUnit runs.

As our test environment has improved over the intervening years and because none of our tests are currently producing errors when these checks are removed, we can safely revert them and give ourselves a more flexible function.

Fixes #6914

Props DJPaul, imath

File:

• trunk/src/bp-core/bp-core-template-loader.php (modified) (2 diffs)

trunk/src/bp-core/bp-core-template-loader.php

@@ -124 +124 @@
     do_action( 'bp_locate_template', $located, $template_name, $template_names, $template_locations, $load, $require_once );
 
-    // Maybe load the template if one was located.
-    $use_themes = defined( 'WP_USE_THEMES' ) && WP_USE_THEMES;
-    $doing_ajax = defined( 'DOING_AJAX' ) && DOING_AJAX;
-
     /**
      * Filter here to allow/disallow template loading.
@@ -135 +131 @@
      * @param bool $value True to load the template, false otherwise.
      */
-    $load_template = (bool) apply_filters( 'bp_locate_template_and_load', $use_themes || $doing_ajax );
-
-    if ( $load_template && ( true == $load ) && ! empty( $located ) ) {
+    $load_template = (bool) apply_filters( 'bp_locate_template_and_load', true );
+
+    if ( $load_template && $load && ! empty( $located ) ) {
         load_template( $located, $require_once );
     }