Revert the rest of r37393 -- appears to be debugging stuff accidentally committed

diff --git a/includes/UserMailer.php b/includes/UserMailer.php
index 0066a71..89753f2 100644 (file)
--- a/includes/UserMailer.php
+++ b/includes/UserMailer.php
@@ -193,7 +193,6 @@ class UserMailer {
                                        }
                                } else {
                                        $sent = mail( $to->toString(), wfQuotedPrintable( $subject ), $body, $headers );
-                                       print "RESULT: $sent.";
                                }
                        } else {
                                $wgErrorString = 'PHP is not configured to send mail';
@@ -223,7 +222,7 @@ class UserMailer {
         */
        static function errorHandler( $code, $string ) {
                global $wgErrorString;
-               $wgErrorString = preg_replace( '/^mail\(\)(\s*\[.*?\])?: /', '', $string . "XXXXXXXXXXXXXXXXXX");
+               $wgErrorString = preg_replace( '/^mail\(\)(\s*\[.*?\])?: /', '', $string );
        }
 
        /**