From 1f2c65a6586bf5d46efc40bf27fa7974d1e13e8b Mon Sep 17 00:00:00 2001 From: nikitozzzzzzz Date: Wed, 6 Jun 2018 18:08:27 +0300 Subject: [PATCH] - fixed getting email templates for Network active themes; --- includes/core/class-mail.php | 18 ++++++++++++++++-- 1 file changed, 16 insertions(+), 2 deletions(-) diff --git a/includes/core/class-mail.php b/includes/core/class-mail.php index 6a629a69..e355594e 100644 --- a/includes/core/class-mail.php +++ b/includes/core/class-mail.php @@ -366,13 +366,20 @@ if ( ! class_exists( 'um\core\Mail' ) ) { */ function locate_template( $template_name ) { // check if there is template at theme folder - $blog_id = $this->get_blog_id(); + //get template file from current blog ID folder $template = locate_template( array( trailingslashit( 'ultimate-member/email' . $blog_id ) . $template_name . '.php' ) ); + //if there isn't template at theme folder for current blog ID get template file from theme folder + if ( is_multisite() && ! $template ) { + $template = locate_template( array( + trailingslashit( 'ultimate-member/email' ) . $template_name . '.php' + ) ); + } + //if there isn't template at theme folder get template file from plugin dir if ( ! $template ) { $path = ! empty( $this->path_by_slug[ $template_name ] ) ? $this->path_by_slug[ $template_name ] : um_path . 'templates/email'; @@ -451,11 +458,18 @@ if ( ! class_exists( 'um\core\Mail' ) ) { $blog_id = $this->get_blog_id(); - // check if there is template at theme folder + // check if there is template at theme blog ID folder $template = locate_template( array( trailingslashit( 'ultimate-member/email' . $blog_id ) . $template_name_file . $ext ) ); + //if there isn't template at theme folder for current blog ID get template file from theme folder + if ( is_multisite() && ! $template ) { + $template = locate_template( array( + trailingslashit( 'ultimate-member/email' ) . $template_name_file . $ext + ) ); + } + // Return what we found. return ! $template ? false : true; }