diff options
author | Pierre Schmitz <pierre@archlinux.de> | 2015-06-04 07:31:04 +0200 |
---|---|---|
committer | Pierre Schmitz <pierre@archlinux.de> | 2015-06-04 07:58:39 +0200 |
commit | f6d65e533c62f6deb21342d4901ece24497b433e (patch) | |
tree | f28adf0362d14bcd448f7b65a7aaf38650f923aa /includes/mail/UserMailer.php | |
parent | c27b2e832fe25651ef2410fae85b41072aae7519 (diff) |
Update to MediaWiki 1.25.1
Diffstat (limited to 'includes/mail/UserMailer.php')
-rw-r--r-- | includes/mail/UserMailer.php | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/includes/mail/UserMailer.php b/includes/mail/UserMailer.php index b5a57a84..3cabdaeb 100644 --- a/includes/mail/UserMailer.php +++ b/includes/mail/UserMailer.php @@ -191,7 +191,7 @@ class UserMailer { $extraParams = $wgAdditionalMailParams; // Hook to generate custom VERP address for 'Return-Path' - wfRunHooks( 'UserMailerChangeReturnPath', array( $to, &$returnPath ) ); + Hooks::run( 'UserMailerChangeReturnPath', array( $to, &$returnPath ) ); # Add the envelope sender address using the -f command line option when PHP mail() is used. # Will default to the $from->address when the UserMailerChangeReturnPath hook fails and the # generated VERP address when the hook runs effectively. @@ -250,7 +250,7 @@ class UserMailer { $headers['Content-transfer-encoding'] = '8bit'; } - $ret = wfRunHooks( 'AlternateUserMailer', array( $headers, $to, $from, $subject, $body ) ); + $ret = Hooks::run( 'AlternateUserMailer', array( $headers, $to, $from, $subject, $body ) ); if ( $ret === false ) { // the hook implementation will return false to skip regular mail sending return Status::newGood(); |