From: Mark A. Hershberger <mah@users.mediawiki.org>
Date: Fri, 29 Jul 2011 01:15:52 +0000 (+0000)
Subject: followup r93415 — there is no “$this” in a static method.
X-Git-Tag: 1.31.0-rc.0~28546
X-Git-Url: http://git.cyclocoop.org/%7B%24www_url%7Dadmin/compta/operations/recherche.php?a=commitdiff_plain;h=a03831aa252829c751e8161feae512e609c4c465;p=lhc%2Fweb%2Fwiklou.git

followup r93415 — there is no “$this” in a static method.
---

diff --git a/docs/hooks.txt b/docs/hooks.txt
index abe40a7b73..c74dbd8a1f 100644
--- a/docs/hooks.txt
+++ b/docs/hooks.txt
@@ -297,7 +297,6 @@ $EditPage: the EditPage object
 
 'AlternateUserMailer': Called before mail is sent so that mail could
 be logged (or something else) instead of using PEAR or SMTP
-$UserMailer: the EditPage object
 $headers: Associative array of headers for the email
 $to: MailAddress object or array
 $from: From address
diff --git a/includes/UserMailer.php b/includes/UserMailer.php
index d14b06e6d7..b3951aec16 100644
--- a/includes/UserMailer.php
+++ b/includes/UserMailer.php
@@ -192,7 +192,7 @@ class UserMailer {
 		$headers['X-Mailer'] = 'MediaWiki mailer';
 		$headers['From'] = $from->toString();
 
-		$ret = wfRunHooks( 'AlternateUserMailer', array( $this, $headers, $to, $from, $subject, $body, $replyto, $contentType ) );
+		$ret = wfRunHooks( 'AlternateUserMailer', array( $headers, $to, $from, $subject, $body, $replyto, $contentType ) );
 		if ( $ret === false ) {
 			return Status::newGood();
 		} else if ( $ret != true ) {