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:
e46fbdd
)
Ensure that only strings get encoded
author
Seamus Lee
<seamuslee001@gmail.com>
Wed, 19 Oct 2016 23:35:12 +0000
(10:35 +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 8537409d36ca0fd6f470f308d01f0ec07dc71eb9..d82250cc7460e65a837befe2296fd7560f6f48d0 100644
(file)
--- a/
CRM/Utils/Array.php
+++ b/
CRM/Utils/Array.php
@@
-1088,9
+1088,12
@@
class CRM_Utils_Array {
if (is_array($value)) {
$array[$key] = self::encode_items($value);
}
- else {
+ else
if (is_string($value))
{
$array[$key] = mb_convert_encoding($value, mb_detect_encoding($value, mb_detect_order(), TRUE), 'UTF-8');
}
+ else {
+ $array[$key] = $value;
+ }
}
return $array;
}