summaryrefslogtreecommitdiffstats
path: root/system
diff options
context:
space:
mode:
authorAndrey Andreev <narf@devilix.net>2014-02-15 20:44:02 +0100
committerAndrey Andreev <narf@devilix.net>2014-02-15 20:44:02 +0100
commitcd74d36ae1ac34c25271b5ff81cc2fd8df099724 (patch)
tree75765a7dbf41fb80ab71a20b611cfd1c93cb8fbb /system
parent81f036753272391360ba5b64e6dd93c4101a8733 (diff)
Rename CI_Utf8::_is_ascii() to is_ascii() and make it public
No reason for it to be protected.
Diffstat (limited to 'system')
-rw-r--r--system/core/Utf8.php6
1 files changed, 2 insertions, 4 deletions
diff --git a/system/core/Utf8.php b/system/core/Utf8.php
index 6ca1a02ca..98352db6f 100644
--- a/system/core/Utf8.php
+++ b/system/core/Utf8.php
@@ -73,14 +73,12 @@ class CI_Utf8 {
*
* Ensures strings contain only valid UTF-8 characters.
*
- * @uses CI_Utf8::_is_ascii() Decide whether a conversion is needed
- *
* @param string $str String to clean
* @return string
*/
public function clean_string($str)
{
- if ($this->_is_ascii($str) === FALSE)
+ if ($this->is_ascii($str) === FALSE)
{
if (ICONV_ENABLED)
{
@@ -147,7 +145,7 @@ class CI_Utf8 {
* @param string $str String to check
* @return bool
*/
- protected function _is_ascii($str)
+ public function is_ascii($str)
{
return (preg_match('/[^\x00-\x7F]/S', $str) === 0);
}