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

@@@ -24,8 -24,9 +24,8 @@@
        }
        $_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", $extra="")
+       function sendmail($to, $subject, $message, $from, $replyto = "", $toname = "", $fromname = "", $errorsto = "returns@cacert.org", $use_utf8 = true)
        {
                $lines = explode("\n", $message);
                $message = "";