Changeset 10594

Timestamp:

02/15/2016 07:12:42 PM (9 years ago)

Author:

imath

Message:

Make sure the BuddyPress Email template can be loaded within the WordPress Administration.

bp_locate_template() is only loading templates if WP_USE_THEMES is defined or if an Ajax request is done, which is not the case inside a regular Administration page. As the email template is a required parameter for the BP_Email class, this was preventing any email to be sent from the WordPress Administration (eg: the activation email using the "resend" action from the Signups screen).
To fix this we are introducing a new filter the BP_Email class is using to get the email template.

Fixes #6912

Location:

trunk/src/bp-core

Files:

• bp-core-template-loader.php (modified) (1 diff)
• classes/class-bp-email.php (modified) (1 diff)

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

@@ -127 +127 @@
     $use_themes = defined( 'WP_USE_THEMES' ) && WP_USE_THEMES;
     $doing_ajax = defined( 'DOING_AJAX' ) && DOING_AJAX;
-    if ( ( $use_themes || $doing_ajax ) && ( true == $load ) && ! empty( $located ) ) {
+
+    /**
+     * Filter here to allow/disallow template loading.
+     *
+     * @since 2.5.0
+     *
+     * @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( $located, $require_once );
     }

trunk/src/bp-core/classes/class-bp-email.php

@@ -736 +736 @@
 
             // Load the template.
+            add_filter( 'bp_locate_template_and_load', '__return_true' );
+
             bp_locate_template( bp_email_get_template( $this->post_object ), true, false );
+
+            remove_filter( 'bp_locate_template_and_load', '__return_true' );
+
             $this->set_template( ob_get_contents() );