projects
/
civicrm-core.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge pull request #15370 from JMAConsulting/core-692-2
[civicrm-core.git]
/
CRM
/
Case
/
BAO
/
CaseType.php
diff --git
a/CRM/Case/BAO/CaseType.php
b/CRM/Case/BAO/CaseType.php
index 2127b92e37d40af115ca9b7d5db401e8d28620e9..7a107d2b15db8e1dce158a5bd82861e9c6b8d246 100644
(file)
--- a/
CRM/Case/BAO/CaseType.php
+++ b/
CRM/Case/BAO/CaseType.php
@@
-219,7
+219,12
@@
class CRM_Case_BAO_CaseType extends CRM_Case_DAO_CaseType {
*/
protected static function encodeXmlString($str) {
// PHP 5.4: return htmlspecialchars($str, ENT_XML1, 'UTF-8')
*/
protected static function encodeXmlString($str) {
// PHP 5.4: return htmlspecialchars($str, ENT_XML1, 'UTF-8')
- return htmlspecialchars($str);
+ if (is_scalar($str)) {
+ return htmlspecialchars($str);
+ }
+ else {
+ return NULL;
+ }
}
/**
}
/**