Merge branch 'g5'

2014-03-03 18:01:11 +09:00
parent daf91e4dac 5f69257625
commit cf326617f9
1 changed files with 1 additions and 1 deletions
--- a/lib/mailer.lib.php
+++ b/lib/mailer.lib.php
@ -17,7 +17,7 @@ function mailer($fname, $fmail, $to, $subject, $content, $type=0, $file="", $cc=
        $content = nl2br($content); 

    $mail = new PHPMailer(); // defaults to using php "mail()"
-    if (defined('G5_SMTP')) {
+    if (defined('G5_SMTP') && G5_SMTP) {
        $mail->IsSMTP(); // telling the class to use SMTP
        $mail->Host = G5_SMTP; // SMTP server
    }