From 6fd3834a7b6bf66344b25c55ab308be196907ff7 Mon Sep 17 00:00:00 2001
From: Andre Lorbach <alorbach@adiscon.com>
Date: Fri, 16 Aug 2013 14:42:29 +0200
Subject: [PATCH] Using default header encoding in GetStringWithHTMLCodes()
 function now.

---
 ChangeLog                        | 2 ++
 src/include/functions_common.php | 6 +++---
 2 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index ac4ee6c..8ec832e 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,6 +1,8 @@
 ---------------------------------------------------------------------------
 Version 3.6.4 (stable), 2013-??-??
 - Added MYSQL hint in install script when enabling User Database System. 
+- Using default header encoding in GetStringWithHTMLCodes() function now. 
+  This should solve http://bugzilla.adiscon.com/show_bug.cgi?id=433.
 ---------------------------------------------------------------------------
 Version 3.6.3 (stable), 2013-02-25
 - Updated Search documentation
diff --git a/src/include/functions_common.php b/src/include/functions_common.php
index 0a89f36..f8c9097 100644
--- a/src/include/functions_common.php
+++ b/src/include/functions_common.php
@@ -66,7 +66,7 @@ $LANG_EN = "en";	// Used for fallback
 $LANG = "en";		// Default language
 
 // Default Template vars
-$content['BUILDNUMBER'] = "3.6.3";
+$content['BUILDNUMBER'] = "3.6.4";
 $content['UPDATEURL'] = "http://loganalyzer.adiscon.com/files/version.txt";
 $content['TITLE'] = "Adiscon LogAnalyzer :: Release " . $content['BUILDNUMBER'];	// Default page title 
 $content['BASEPATH'] = $gl_root_path;
@@ -1171,10 +1171,10 @@ function ReplaceLineBreaksInString($myStr)
 
 function GetStringWithHTMLCodes($myStr)
 {
+	global $content; 
 
 	// Replace all special characters with valid html representations
-	return htmlentities($myStr, ENT_NOQUOTES, "UTF-8");
-//TODO CONFIGURABLE!
+	return htmlentities($myStr, ENT_NOQUOTES, $content['HeaderDefaultEncoding']); //"UTF-8");
 }
 
 function InitTemplateParser()