Renaming the unicode class to utf8 so we don't run the risk of violating the Unicode Consortium's trademark.

4 files changed, 16 insertions, 16 deletions

diff --git a/system/core/CodeIgniter.php b/system/core/CodeIgniter.php
index 742903653..2d3f24958 100644
--- a/system/core/CodeIgniter.php
+++ b/system/core/CodeIgniter.php
@@ -129,17 +129,17 @@
 
 /*
  * ------------------------------------------------------
- *  Instantiate the Unicode class
+ *  Instantiate the UTF-8 class
  * ------------------------------------------------------
  *
- * Note: Order here is rather important as the Unicode
+ * Note: Order here is rather important as the UTF-8
  * class needs to be used very early on, but it cannot
  * properly determine if UTf-8 can be supported until
  * after the Config class is instantiated.
  *
  */
 
-	$UNI =& load_class('Unicode', 'core');
+	$UNI =& load_class('Utf8', 'core');
 
 /*
  * ------------------------------------------------------
diff --git a/system/core/Input.php b/system/core/Input.php
index 9668058c1..1157601e1 100644
--- a/system/core/Input.php
+++ b/system/core/Input.php
@@ -59,7 +59,7 @@ class CI_Input {
 			$this->security =& load_class('Security');
 		}
 
-		// Do we need the Unicode class?
+		// Do we need the UTF-8 class?
 		if (UTF8_ENABLED === TRUE)
 		{
 			global $UNI;
diff --git a/system/core/Unicode.php b/system/core/Unicode.php
index ee32c986d..5d5a7ef72 100644
--- a/system/core/Unicode.php
+++ b/system/core/Unicode.php
@@ -16,17 +16,17 @@
 // ------------------------------------------------------------------------
 
 /**
- * Unicode Class
+ * Utf8 Class
  *
- * Provides unicode support for UTF-8 environments
+ * Provides support for UTF-8 environments
  *
  * @package		CodeIgniter
  * @subpackage	Libraries
- * @category	Unicode
+ * @category	UTF-8
  * @author		ExpressionEngine Dev Team
- * @link		http://codeigniter.com/user_guide/libraries/unicode.html
+ * @link		http://codeigniter.com/user_guide/libraries/utf8.html
  */
-class CI_Unicode {
+class CI_Utf8 {
 
 	/**
 	 * Constructor
@@ -36,7 +36,7 @@ class CI_Unicode {
 	 */
 	function __construct()
 	{
-		log_message('debug', "Unicode Class Initialized");
+		log_message('debug', "Utf8 Class Initialized");
 
 		global $CFG;
 
@@ -47,7 +47,7 @@ class CI_Unicode {
 			AND $CFG->item('charset') == 'UTF-8'			// Application charset must be UTF-8
 			)
 		{
-			log_message('debug', "Unicode Class - UTF-8 Support Enabled");
+			log_message('debug', "UTF-8 Support Enabled");
 
 			define('UTF8_ENABLED', TRUE);
 
@@ -66,7 +66,7 @@ class CI_Unicode {
 		}
 		else
 		{
-			log_message('debug', "Unicode Class - UTF-8 Support Disabled");
+			log_message('debug', "UTF-8 Support Disabled");
 			define('UTF8_ENABLED', FALSE);
 		}
 	}
@@ -159,7 +159,7 @@ class CI_Unicode {
 	// --------------------------------------------------------------------
 
 }
-// End Unicode Class
+// End Utf8 Class
 
-/* End of file Unicode.php */
-/* Location: ./system/core/Unicode.php */
\ No newline at end of file
+/* End of file Utf8.php */
+/* Location: ./system/core/Utf8.php */
\ No newline at end of file
diff --git a/user_guide/general/core_classes.html b/user_guide/general/core_classes.html
index 35043d9ca..e36a5e2b9 100644
--- a/user_guide/general/core_classes.html
+++ b/user_guide/general/core_classes.html
@@ -84,8 +84,8 @@ know what you are doing before attempting it.</p>
 <li>Log</li>
 <li>Output</li>
 <li>Router</li>
-<li>Unicode</li>
 <li>URI</li>
+<li>Utf8</li>
 </ul>
 
 <h2>Replacing Core Classes</h2>