From c6adef5ef75d8cf083820d6470b86138af7971b7 Mon Sep 17 00:00:00 2001
From: Oldperl <44996956+oldperl@users.noreply.github.com>
Date: Mon, 11 Sep 2017 10:05:57 +0000
Subject: [PATCH] fixes for release 2.0.2

---
 setup/makeconfig.php           | 2 ++
 setup/templates/config.php.tpl | 8 +++-----
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/setup/makeconfig.php b/setup/makeconfig.php
index a08050d..572ed05 100644
--- a/setup/makeconfig.php
+++ b/setup/makeconfig.php
@@ -71,6 +71,8 @@ if ($_SESSION['setuptype'] == 'setup') {
 	$tpl->set('s', 'CON_UTF8', '');
 }
 
+$tpl->set('s','MYSQL_CHARSET', '');
+
 if ($_SESSION['configmode'] == 'save') {
     $sCfgFileOld = $root_path . '/conlite/includes/config.php';
     $sCfgFileNew = $root_path . '/data/config/'.CL_ENVIRONMENT.'/config.php';
diff --git a/setup/templates/config.php.tpl b/setup/templates/config.php.tpl
index a760973..58161de 100644
--- a/setup/templates/config.php.tpl
+++ b/setup/templates/config.php.tpl
@@ -3,19 +3,17 @@
  * ConLite Configuration File
  * 
  * This file was generated by ConLite setup!
- * Ifyou wannt to modify any configuration value please create a local
+ * If you want to modify any configuration value please create a local
  * configuration file "config.local.php" in the configuration folder and
  * modify or define settings within.
  * 
  * @package Core
  * @subpackage Setup
- * @version 1.0.0
+ * @version 1.1.0
  * @author Ortwin Pinke
- * @copyright (c) 2015, ConLite Team
+ * @copyright (c) 2017, ConLite Team
  * @license 
  * @link http://conlite.org
- * 
- * $Id$
  */
 
 defined('CON_FRAMEWORK') or die('Illegal call');