Merge branch 'bug-1389' into testserver-stable
authorBenny Baumann <BenBE@geshi.org>
Wed, 29 Jul 2015 17:19:33 +0000 (19:19 +0200)
committerBenny Baumann <BenBE@geshi.org>
Wed, 29 Jul 2015 17:19:33 +0000 (19:19 +0200)
1  2 
includes/mysql.php.sample

@@@ -24,6 -24,7 +24,6 @@@
        }
        $_SESSION['_config']['normalhostname'] = "www.cacert.org";
        $_SESSION['_config']['securehostname'] = "secure.cacert.org";
 -      $_SESSION['_config']['tverify'] = "tverify.cacert.org";
  
        function sendmail($to, $subject, $message, $from, $replyto = "", $toname = "", $fromname = "", $errorsto = "returns@cacert.org", $use_utf8 = true)
        {
@@@ -82,7 -83,7 +82,7 @@@
                        fputs($smtp, "Subject: $subject\r\n");
                }
                fputs($smtp, "Mime-Version: 1.0\r\n");
-               if($extra == "")
+               if($use_utf8)
                {
                        fputs($smtp, "Content-Type: text/plain; charset=\"utf-8\"\r\n");
                }