diff options
Diffstat (limited to 'includes/mail')
| -rw-r--r-- | includes/mail/UserMailer.php | 13 |
1 files changed, 1 insertions, 12 deletions
diff --git a/includes/mail/UserMailer.php b/includes/mail/UserMailer.php index 7b48ad095a8e..bdd4f448748f 100644 --- a/includes/mail/UserMailer.php +++ b/includes/mail/UserMailer.php @@ -198,14 +198,8 @@ class UserMailer { private static function isMailMimeUsable() { static $usable = null; if ( $usable === null ) { - // If the class is not already loaded, and it's in the include path, - // try requiring it. - if ( !class_exists( 'Mail_mime' ) && stream_resolve_include_path( 'Mail/mime.php' ) ) { - require_once 'Mail/mime.php'; - } $usable = class_exists( 'Mail_mime' ); } - return $usable; } @@ -218,11 +212,6 @@ class UserMailer { private static function isMailUsable() { static $usable = null; if ( $usable === null ) { - // If the class is not already loaded, and it's in the include path, - // try requiring it. - if ( !class_exists( 'Mail' ) && stream_resolve_include_path( 'Mail.php' ) ) { - require_once 'Mail.php'; - } $usable = class_exists( 'Mail' ); } @@ -396,7 +385,7 @@ class UserMailer { Wikimedia\suppressWarnings(); // Create the mail object using the Mail::factory method - $mail_object =& Mail::factory( 'smtp', $wgSMTP ); + $mail_object = Mail::factory( 'smtp', $wgSMTP ); if ( PEAR::isError( $mail_object ) ) { wfDebug( "PEAR::Mail factory failed: " . $mail_object->getMessage() . "\n" ); Wikimedia\restoreWarnings(); |