X-Git-Url: http://git.heureux-cyclage.org/?a=blobdiff_plain;f=includes%2FUserMailer.php;h=f5f27f628410c6e4235971d0acf8b1d8f33dcd23;hb=d238b93290c86e2495e3e67d99630d9cdace2471;hp=aa37f4c72be7991a05e1df574bb6a3b98d9475a4;hpb=2104f62734f5f16f9f6d78e9782db2375c0805ad;p=lhc%2Fweb%2Fwiklou.git

diff --git a/includes/UserMailer.php b/includes/UserMailer.php
index aa37f4c72b..f5f27f6284 100644
--- a/includes/UserMailer.php
+++ b/includes/UserMailer.php
@@ -302,13 +302,13 @@ class EmailNotification {
 		if( $article->mNamespace != NS_MAIN ) {
 			$pagetitle = $wgLang->getNsText( $article->mNamespace ) . ':' . $pagetitle;
 		}
-		$subject = str_replace( '$PAGETITLE_QP', wfQuotedPrintable( str_replace( '_', ' ', $pagetitle ) ), $subject);
+		$subject = str_replace( '$PAGETITLE', str_replace( '_', ' ', $pagetitle ) , $subject);
 		$keys['%24PAGETITLE_RAWURL'] = wfUrlencode( $pagetitle );
 		$keys['$PAGETITLE_RAWURL']   = wfUrlencode( $pagetitle );
 		$keys['%24PAGETITLE']        = $pagetitle; # needed for the {{localurl:$PAGETITLE}} in the messagetext, "$" appears here as "%24"
 		$keys['$PAGETITLE']          = $pagetitle;
 		$keys['$PAGETIMESTAMP']      = $article->mTimestamp;	# this is the raw internal timestamp - can be useful, too
-		$keys['$PAGEEDITDATEUTC']    = $wgLang->timeanddate( $article->mTimestamp, false, false, false, true );
+		$keys['$PAGEEDITDATEUTC']    = $wgLang->timeanddate( $article->mTimestamp, false, false, false );
 		$keys['$PAGEMINOREDIT']      = $medit;
 		$keys['$PAGESUMMARY']        = $summary;
 	
@@ -316,9 +316,9 @@ class EmailNotification {
 		# Reveal the page editor's address as REPLY-TO address only if
 		# the user has not opted-out and the option is enabled at the
 		# global configuration level.
-		$pageeditor_qp = wfQuotedPrintable( $pageeditorUser->getName() );
+		$name    = $pageeditorUser->getName();
 		$adminAddress = 'WikiAdmin <' . $wgEmergencyContact . '>';
-		$editorAddress = $pageeditorUser->getName() . ' <' . $pageeditorUser->getEmail() . '>';
+		$editorAddress = $name . ' <' . $pageeditorUser->getEmail() . '>';
 		if( $wgEmailNotificationRevealPageEditorAddress
 		    && ( $pageeditorUser->getEmail() != '' )
 		    && $pageeditorUser->getOption( 'enotifrevealaddr' ) ) {
@@ -335,12 +335,11 @@ class EmailNotification {
 			$keys['$PAGEEDITORNAMEANDEMAILADDR'] = $replyto;
 		}
 	
-		if( $pageeditorUser->isIP( $pageeditorUser->getName() ) ) {
+		if( $pageeditorUser->isIP( $name ) ) {
 			#real anon (user:xxx.xxx.xxx.xxx)
-			$subject = str_replace('$PAGEEDITOR_QP', 'anonymous user ' . $pageeditorUser->getName(), $subject);
-			$name    = $pageeditorUser->getName();
 			$anon    = $name . ' (anonymous user)';
 			$anonUrl = wfUrlencode( $name ) . ' (anonymous user)';
+			$subject = str_replace('$PAGEEDITOR', 'anonymous user '. $name, $subject);
 			
 			$keys['$PAGEEDITOR_RAWURL']   = $anonUrl;
 			$keys['%24PAGEEDITOR_RAWURL'] = $anonUrl;
@@ -348,13 +347,12 @@ class EmailNotification {
 			$keys['$PAGEEDITORE']         = $anon;
 			$keys['$PAGEEDITOR']          = 'anonymous user ' . $name;
 		} else {
-			$name = $pageeditorUser->getName();
-			$subject = str_replace('$PAGEEDITOR_QP', $pageeditor_qp, $subject);
+			$subject = str_replace('$PAGEEDITOR', $name, $subject);
 			$keys['$PAGEEDITOR_RAWURL']   = wfUrlencode( $name );
 			$keys['%24PAGEEDITOR_RAWURL'] = wfUrlencode( $name );
 			$keys['%24PAGEEDITORE']       = $pageeditorUser->getTitleKey();
 			$keys['$PAGEEDITORE']         = $pageeditorUser->getTitleKey();
-			$keys['$PAGEEDITOR']          = $pageeditorUser->getName();
+			$keys['$PAGEEDITOR']          = $name;
 		}
 		$body = strtr( $body, $keys );
 	
@@ -362,7 +360,7 @@ class EmailNotification {
 		$this->to      = $to;
 		$this->from    = $from;
 		$this->replyto = $replyto;
-		$this->subject = $subject;
+		$this->subject = wfQuotedprintable($subject);
 		$this->body    = $body;
 		return $this;
 	}
@@ -396,7 +394,7 @@ class EmailNotification {
 		# expressed in terms of individual local time of the notification
 		# recipient, i.e. watching user
 		$body = str_replace('$PAGEEDITDATE',
-			$wgLang->timeanddate( $article->mTimestamp, true, false, $timecorrection, true),
+			$wgLang->timeanddate( $article->mTimestamp, true, false, $timecorrection ),
 			$body);
 		
 		$error = userMailer( $to, $mail->from, $mail->subject, $body, $mail->replyto );