X-Git-Url: http://git.heureux-cyclage.org/?a=blobdiff_plain;f=includes%2FUserMailer.php;h=0097620810399e8ae8a81b7aa7a6ebb902885c88;hb=027030d18104525bd9c3e7b6fb68251e9ead6820;hp=fd87388b615c9f95533ed4b4c9d2817bd7e2784e;hpb=c431c9af1ac2a43146155e57e754309a9e27f24b;p=lhc%2Fweb%2Fwiklou.git

diff --git a/includes/UserMailer.php b/includes/UserMailer.php
index fd87388b61..0097620810 100644
--- a/includes/UserMailer.php
+++ b/includes/UserMailer.php
@@ -48,7 +48,7 @@ function wfRFC822Phrase( $phrase ) {
  * @param string $replyto optional reply-to email (default : false)
  */
 function userMailer( $to, $from, $subject, $body, $replyto=false ) {
-	global $wgUser, $wgSMTP, $wgOutputEncoding, $wgErrorString, $wgEmergencyContact;
+	global $wgUser, $wgSMTP, $wgOutputEncoding, $wgErrorString;
 
 	if (is_array( $wgSMTP )) {
 		require_once( 'Mail.php' );
@@ -155,13 +155,8 @@ class EmailNotification {
 	function notifyOnPageChange(&$title, $timestamp, $summary, $minorEdit, $oldid=false) {
 
 		# we use $wgEmergencyContact as sender's address
-		global $wgUser, $wgLang, $wgEmergencyContact;
-		global $wgEnotifWatchlist, $wgEnotifMinorEdits;
-		global $wgEnotifUserTalk;
-		global $wgEnotifRevealEditorAddress;
-		global $wgEnotifFromEditor;
-		global $wgEmailAuthentication;
-		global $wgShowUpdatedMarker;
+		global $wgUser, $wgEnotifWatchlist;
+		global $wgEnotifMinorEdits, $wgEnotifUserTalk, $wgShowUpdatedMarker;
 
 		$fname = 'UserMailer::notifyOnPageChange';
 		wfProfileIn( $fname );
@@ -237,10 +232,8 @@ class EmailNotification {
 	 * @access private
 	 */
 	function composeCommonMailtext() {
-		global $wgLang, $wgUser, $wgEmergencyContact;
-		global $wgEnotifRevealEditorAddress;
-		global $wgEnotifFromEditor;
-		global $wgNoReplyAddress;
+		global $wgUser, $wgEmergencyContact, $wgNoReplyAddress;
+		global $wgEnotifFromEditor, $wgEnotifRevealEditorAddress;
 
 		$summary = ($this->summary == '') ? ' - ' : $this->summary;
 		$medit   = ($this->minorEdit) ? wfMsg( 'minoredit' ) : '';