projects
/
civicrm-core.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
589e0f0
)
get php to detect encoding
author
Seamus Lee
<seamuslee001@gmail.com>
Mon, 17 Oct 2016 00:15:34 +0000
(11:15 +1100)
committer
Seamus Lee
<seamuslee001@gmail.com>
Wed, 19 Oct 2016 23:35:51 +0000
(10:35 +1100)
CRM/Utils/Array.php
patch
|
blob
|
blame
|
history
diff --git
a/CRM/Utils/Array.php
b/CRM/Utils/Array.php
index 5559c9ad9251f92e34c7a720dda2cf00eee0414e..8537409d36ca0fd6f470f308d01f0ec07dc71eb9 100644
(file)
--- a/
CRM/Utils/Array.php
+++ b/
CRM/Utils/Array.php
@@
-1089,7
+1089,7
@@
class CRM_Utils_Array {
$array[$key] = self::encode_items($value);
}
else {
- $array[$key] = mb_convert_encoding($value,
'Windows-1252'
, 'UTF-8');
+ $array[$key] = mb_convert_encoding($value,
mb_detect_encoding($value, mb_detect_order(), TRUE)
, 'UTF-8');
}
}
return $array;