From b940ebc2d8f7b830c877777a14259da4927ce3fe Mon Sep 17 00:00:00 2001
From: Derek Jones <derek.jones@ellislab.com>
Date: Thu, 12 Jul 2007 19:15:09 +0000
Subject: added $config['charset']

---
 system/application/config/config.php | 10 ++++++++++
 user_guide/changelog.html            |  1 +
 2 files changed, 11 insertions(+)

diff --git a/system/application/config/config.php b/system/application/config/config.php
index 941d9c303..f0ba241f6 100644
--- a/system/application/config/config.php
+++ b/system/application/config/config.php
@@ -68,6 +68,16 @@ $config['url_suffix'] = "";
 */
 $config['language']	= "english";
 
+/*
+|--------------------------------------------------------------------------
+| Default Character Set
+|--------------------------------------------------------------------------
+|
+| This determines which character set is used by default in various methods
+| that require a character set to be provided.
+|
+*/
+$config['charset'] = "UTF-8";
 
 /*
 |--------------------------------------------------------------------------
diff --git a/user_guide/changelog.html b/user_guide/changelog.html
index 468f42c0d..8113f3787 100644
--- a/user_guide/changelog.html
+++ b/user_guide/changelog.html
@@ -71,6 +71,7 @@ Change Log
 	<li>Added some additional mime types in application/config/mimes.php.</li>
 	<li>Added filename_security() method to <a href="./libraries/input.html">Input library</a>.</li>
 	<li>Added some additional arguments to the <a href="./helpers/inflector_helper.html">Inflection helper</a> singular() to compensate for words ending in "s".  Also added a force parameter to pluralize().</li>
+	<li>Added $config['charset'] to the config file.  Default value is 'UTF-8', used in some string handling functions.</li>
 	<li>Fixed MSSQL insert_id().</li>
 	<li>Fixed a logic error in the DB trans_status() function.  It was incorrectly returning TRUE on failure and FALSE on success.</li>
 	<li>Fixed a bug that was allowing multiple load attempts on extended classes.</li>
-- 
cgit v1.2.3-24-g4f1b