summaryrefslogtreecommitdiffstats
path: root/system/core/Unicode.php
diff options
context:
space:
mode:
authorPascal Kriete <pascal.kriete@ellislab.com>2010-11-04 22:59:52 +0100
committerPascal Kriete <pascal.kriete@ellislab.com>2010-11-04 22:59:52 +0100
commite917f9be8b05c81357c1c2c9730d5060685d644d (patch)
treeb6a7d5ce8ba57b69ba61454f77829b04f2ce5974 /system/core/Unicode.php
parent5b2d2da5ae2e97043c6bef53e565d30e50196e2b (diff)
parente1f6e9ddff788f6a154f5f35dc117d14aeb0c484 (diff)
Automated merge with http://hg.ellislab.com/CodeIgniter2
Diffstat (limited to 'system/core/Unicode.php')
-rw-r--r--system/core/Unicode.php28
1 files changed, 14 insertions, 14 deletions
diff --git a/system/core/Unicode.php b/system/core/Unicode.php
index ec40c11ed..3aeb51b57 100644
--- a/system/core/Unicode.php
+++ b/system/core/Unicode.php
@@ -30,14 +30,14 @@ class CI_Unicode {
/**
* Constructor
- *
+ *
* Determines if UTF-8 support is to be enabled
- *
+ *
*/
function CI_Unicode()
{
log_message('debug', "Unicode Class Initialized");
-
+
global $CFG;
if (
@@ -48,7 +48,7 @@ class CI_Unicode {
)
{
log_message('debug', "Unicode Class - UTF-8 Support Enabled");
-
+
define('UTF8_ENABLED', TRUE);
// set internal encoding for multibyte string functions if necessary
@@ -68,11 +68,11 @@ class CI_Unicode {
{
log_message('debug', "Unicode Class - UTF-8 Support Disabled");
define('UTF8_ENABLED', FALSE);
- }
+ }
}
-
+
// --------------------------------------------------------------------
-
+
/**
* Clean UTF-8 strings
*
@@ -88,19 +88,19 @@ class CI_Unicode {
{
$str = @iconv('UTF-8', 'UTF-8//IGNORE', $str);
}
-
+
return $str;
}
// --------------------------------------------------------------------
-
+
/**
* Remove ASCII control characters
*
* Removes all ASCII control characters except horizontal tabs,
* line feeds, and carriage returns, as all others can cause
* problems in XML
- *
+ *
* @access public
* @param string
* @return string
@@ -111,7 +111,7 @@ class CI_Unicode {
}
// --------------------------------------------------------------------
-
+
/**
* Convert to UTF-8
*
@@ -136,12 +136,12 @@ class CI_Unicode {
{
return FALSE;
}
-
+
return $str;
}
// --------------------------------------------------------------------
-
+
/**
* Is ASCII?
*
@@ -157,7 +157,7 @@ class CI_Unicode {
}
// --------------------------------------------------------------------
-
+
}
// End Unicode Class