Resolved #3075 where some email notifications did not respect HTML fo…

…rmatting preference
ExpressionEngine · Mar 20, 2023 · 3937df0 · 3937df0
1 parent ebe0516
commit 3937df0
Show file tree

Hide file tree

Showing 4 changed files with 7 additions and 0 deletions.
diff --git a/.gitignore b/.gitignore
@@ -39,6 +39,9 @@ system/user/config/database.php
 system/user/language/*
 !system/user/language/index.html
 
+system/user/logs/*
+!system/user/logs/index.html
+
 system/user/templates/*
 !system/user/templates/index.html
 !system/user/templates/.htaccess

diff --git a/system/ee/ExpressionEngine/Addons/comment/Service/Notifications.php b/system/ee/ExpressionEngine/Addons/comment/Service/Notifications.php
@@ -255,6 +255,7 @@ private function send($template, $to, $replyto)
 
             ee()->email->EE_initialize();
             ee()->email->wordwrap = false;
+            ee()->email->mailtype = ee()->config->item('mail_format');
             ee()->email->from(ee()->config->item('webmaster_email'), ee()->config->item('webmaster_name'));
             ee()->email->to($address['email']);
             ee()->email->reply_to($replyto);

diff --git a/system/ee/ExpressionEngine/Addons/member/mod.member_register.php b/system/ee/ExpressionEngine/Addons/member/mod.member_register.php
@@ -532,6 +532,7 @@ public function register_member()
 
             ee()->load->library('email');
             ee()->email->wordwrap = true;
+            ee()->email->mailtype = ee()->config->item('mail_format');
             ee()->email->from(ee()->config->item('webmaster_email'), ee()->config->item('webmaster_name'));
             ee()->email->to($notify_address);
             ee()->email->subject($email_tit);
@@ -579,6 +580,7 @@ public function register_member()
 
             ee()->load->library('email');
             ee()->email->wordwrap = true;
+            ee()->email->mailtype = ee()->config->item('mail_format');
             ee()->email->from(ee()->config->item('webmaster_email'), ee()->config->item('webmaster_name'));
             ee()->email->to($data['email']);
             ee()->email->subject($email_tit);

diff --git a/system/ee/legacy/controllers/cp/login.php b/system/ee/legacy/controllers/cp/login.php
@@ -842,6 +842,7 @@ public function send_reset_token()
         // Instantiate the email class
         $this->load->library('email');
         $this->email->wordwrap = true;
+        $this->email->mailtype = ee()->config->item('mail_format');
         $this->email->from($this->config->item('webmaster_email'), $this->config->item('webmaster_name'));
         $this->email->to($address);
         $this->email->subject($message_title);