X-Git-Url: https://git.cyclocoop.org/?a=blobdiff_plain;f=includes%2FUserMailer.php;h=6157f78122061eda6faa734cade05706d3ee62f5;hb=368a95dc658bada230ba8f163e8e9f85e99c8263;hp=049db6a63b2494b155a8d8c611b589031ee8a805;hpb=d0c1cdbfae9006c13e46175825ed76b0851f2b0d;p=lhc%2Fweb%2Fwiklou.git

diff --git a/includes/UserMailer.php b/includes/UserMailer.php
index 049db6a63b..6157f78122 100644
--- a/includes/UserMailer.php
+++ b/includes/UserMailer.php
@@ -267,7 +267,7 @@ class UserMailer {
 					$body['text'] = str_replace( "\n", "\r\n", $body['text'] );
 					$body['html'] = str_replace( "\n", "\r\n", $body['html'] );
 				}
-				$mime = new Mail_mime( array( 'eol' => $endl ) );
+				$mime = new Mail_mime( array( 'eol' => $endl, 'text_charset' => 'UTF-8', 'html_charset' => 'UTF-8' ) );
 				$mime->setTXTBody( $body['text'] );
 				$mime->setHTMLBody( $body['html'] );
 				$body = $mime->get(); // must call get() before headers()
@@ -352,14 +352,19 @@ class UserMailer {
 			ini_set( 'html_errors', '0' );
 			set_error_handler( 'UserMailer::errorHandler' );
 
-			$safeMode = wfIniGetBool( 'safe_mode' );
+			try {
+				$safeMode = wfIniGetBool( 'safe_mode' );
 
-			foreach ( $to as $recip ) {
-				if ( $safeMode ) {
-					$sent = mail( $recip, self::quotedPrintable( $subject ), $body, $headers );
-				} else {
-					$sent = mail( $recip, self::quotedPrintable( $subject ), $body, $headers, $wgAdditionalMailParams );
+				foreach ( $to as $recip ) {
+					if ( $safeMode ) {
+						$sent = mail( $recip, self::quotedPrintable( $subject ), $body, $headers );
+					} else {
+						$sent = mail( $recip, self::quotedPrintable( $subject ), $body, $headers, $wgAdditionalMailParams );
+					}
 				}
+			} catch ( Exception $e ) {
+				restore_error_handler();
+				throw $e;
 			}
 
 			restore_error_handler();
@@ -751,10 +756,17 @@ class EmailNotification {
 		# Replace this after transforming the message, bug 35019
 		$postTransformKeys['$PAGESUMMARY'] = $this->summary == '' ? ' - ' : $this->summary;
 
-		# Now build message's subject and body
+		// Now build message's subject and body
+
+		// Messages:
+		// enotif_subject_deleted, enotif_subject_created, enotif_subject_moved,
+		// enotif_subject_restored, enotif_subject_changed
 		$this->subject = wfMessage( 'enotif_subject_' . $this->pageStatus )->inContentLanguage()
 			->params( $pageTitle, $keys['$PAGEEDITOR'] )->text();
 
+		// Messages:
+		// enotif_body_intro_deleted, enotif_body_intro_created, enotif_body_intro_moved,
+		// enotif_body_intro_restored, enotif_body_intro_changed
 		$keys['$PAGEINTRO'] = wfMessage( 'enotif_body_intro_' . $this->pageStatus )
 			->inContentLanguage()->params( $pageTitle, $keys['$PAGEEDITOR'], $pageTitleUrl )
 			->text();