oreolek/batufa
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

Updated utf8::clean() to allow defining the charset

Browse source
This commit is contained in:
Woody Gilk 2008-12-09 23:08:33 -06:00
parent f3b65b0372
commit 342912e573
1 changed files with 5 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
system/classes/utf8.php
View file

@ -33,13 +33,14 @@ final class utf8 {
/** /**
* Recursively cleans arrays, objects, and strings. Removes ASCII control * Recursively cleans arrays, objects, and strings. Removes ASCII control
* codes and converts to UTF-8 while silently discarding incompatible * codes and converts to the requested charset while silently discarding
* UTF-8 characters. * incompatible characters.
* *
* @param mixed variable to clean * @param mixed variable to clean
* @param string character set, defaults to UTF-8
* @return mixed * @return mixed
*/ */
public static function clean($var) public static function clean($var, $charset = 'UTF-8')
{ {
if (is_array($var) OR is_object($var)) if (is_array($var) OR is_object($var))
{ {
@ -60,7 +61,7 @@ final class utf8 {
$ER = error_reporting(~E_NOTICE); $ER = error_reporting(~E_NOTICE);
// iconv is expensive, so it is only used when needed // iconv is expensive, so it is only used when needed
$var = iconv('UTF-8', 'UTF-8//IGNORE', $var); $var = iconv($charset, $charset.'//IGNORE', $var);
// Turn notices back on // Turn notices back on
error_reporting($ER); error_reporting($ER);