Merge branch 'wip-MDL-41196-m26' of git://github.com/samhemelryk/moodle

ragusa87 · Aug 22, 2013 · 50cb891 · 50cb891
2 parents 52ef750 + ba214fa
commit 50cb891
Showing 1 changed file with 1 addition and 1 deletion.
diff --git a/lib/phpmailer/moodle_phpmailer.php b/lib/phpmailer/moodle_phpmailer.php
@@ -135,7 +135,7 @@ public function EncodeQP($string, $line_max = 76, $space_conv = false) {
      */
     protected function PostSend() {
         // Now ask phpunit if it wants to catch this message.
-        if (phpunit_util::is_redirecting_messages()) {
+        if (PHPUNIT_TEST && phpunit_util::is_redirecting_messages()) {
             $mail = new stdClass();
             $mail->header = $this->MIMEHeader;
             $mail->body = $this->MIMEBody;