X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=inc%2Ffunctions.php;h=21938e565e2ac5a512350e0895d0abcc89252f25;hb=55980dc6bc65fb3c766ff053440a7446962cb85f;hp=6cb2c7e5645fbf46cb4cedffd99011a4198e7f99;hpb=5e59f0f3acb5645439eb8ca5f8030b17931f1102;p=mailer.git

diff --git a/inc/functions.php b/inc/functions.php
index 6cb2c7e564..21938e565e 100644
--- a/inc/functions.php
+++ b/inc/functions.php
@@ -353,7 +353,7 @@ function loadTemplate ($template, $return=false, $content=array()) {
 			$ret = '';
 			if ((strpos($GLOBALS['tpl_content'], '$') !== false) || (strpos($GLOBALS['tpl_content'], '{--') !== false) || (strpos($GLOBALS['tpl_content'], '{!') !== false) || (strpos($GLOBALS['tpl_content'], '{?') !== false)) {
 				// Normal HTML output?
-				if ($GLOBALS['output_mode'] == 0) {
+				if (getOutputMode() == 0) {
 					// Add surrounding HTML comments to help finding bugs faster
 					$ret = "<!-- Template " . $template . " - Start -->\n" . $GLOBALS['tpl_content'] . "<!-- Template " . $template . " - End -->\n";
 
@@ -670,6 +670,11 @@ function sendRawEmail ($toEmail, $subject, $message, $from) {
 
 		// get new instance
 		$mail = new PHPMailer();
+
+		// Set charset to UTF-8
+		$mail->CharSet('UTF-8');
+
+		// Path for PHPMailer
 		$mail->PluginDir  = sprintf("%sinc/phpmailer/", getConfig('PATH'));
 
 		$mail->IsSMTP();