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

diff --git a/docs/hooks.txt b/docs/hooks.txt
index abe40a7..c74dbd8 100644 (file)
--- 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 d14b06e..b3951ae 100644 (file)
--- 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 ) {