gnh1201/reasonableframework
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Update string.utils.php

Browse Source
This commit is contained in:
Namhyeon Go 2020-01-25 02:46:15 +09:00 committed by GitHub
parent 9508d3f2b7
commit cdf1d910a9
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 9 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
helper/string.utils.php
View File

@ -22,9 +22,9 @@ if(!check_function_exists("get_converted_string")) {
// detect charset (output)
if($to_charset == "detect") {
if(check_function_exists("mb_internal_encoding")) {
$from_charset = mb_internal_encoding();
$to_charset = mb_internal_encoding();
} elseif(check_function_exists("iconv_get_encoding")) {
$from_charset = iconv_get_encoding("internal_encoding");
$to_charset = iconv_get_encoding("internal_encoding");
} else {
$_candidates = array(
ini_get("default_charset"),
@ -32,9 +32,15 @@ if(!check_function_exists("get_converted_string")) {
ini_get("mbstring.internal_encoding"),
"UTF-8"
);
foreach($_candidates as $_candidate) {
if(!empty($_candidate)) {
$to_charset = $_candidate;
break;
}
}
}
}
// normalize charset (UPPERCASE)
$from_charset = strtoupper($from_charset);
$to_charset = strtoupper($from_charset);