Merge pull request #618 from bekatoros/patch-1

Add UTF-8 support when sending e-mail for password reset and User activation
omeka · May 8, 2014 · 7e1b075 · 7e1b075
2 parents 283e77f + 11ac39c
commit 7e1b075
Showing 1 changed file with 2 additions and 2 deletions.
diff --git a/application/controllers/UsersController.php b/application/controllers/UsersController.php
@@ -95,7 +95,7 @@ private function _sendResetPasswordEmail($toEmail, $activationCode)
     {
         $siteTitle = get_option('site_title');
 
-        $mail = new Zend_Mail();
+        $mail = new Zend_Mail('UTF-8');
         $mail->addTo($toEmail);                
         $mail->addHeader('X-Mailer', 'PHP/' . phpversion());
 
@@ -354,7 +354,7 @@ protected function sendActivationEmail($user)
                     . __('%s Administrator', $siteTitle);
         $subject    = __('Activate your account with the %s repository', $siteTitle);
 
-        $mail = new Zend_Mail();
+        $mail = new Zend_Mail('UTF-8');
         $mail->setBodyText($body);
         $mail->setFrom($from, "$siteTitle Administrator");
         $mail->addTo($user->email, $user->name);