diff --git a/include/utils/VtlibUtils.php b/include/utils/VtlibUtils.php index 077a20401b70023605218f1fae8c6796a97b1b92..305486a5b9ab9110099882df1c5217f608113895 100644 --- a/include/utils/VtlibUtils.php +++ b/include/utils/VtlibUtils.php @@ -720,7 +720,10 @@ function vtlib_purify($input, $ignore = false) { } $purified_cache[$encryptInput] = $value; } - $value = str_replace('&', '&', $value); + + if ($value && !is_array($value)) { + $value = str_replace('&', '&', $value); + } return $value; } @@ -957,4 +960,4 @@ if (!function_exists('get_magic_quotes_gpc')) { } } -?> \ No newline at end of file +?> diff --git a/includes/http/Request.php b/includes/http/Request.php index eaf0b5b5406d39ad3c5bc4871323ae75cd2e38f7..02a053ee79ed15117e322bd0287820e91c13f365 100644 --- a/includes/http/Request.php +++ b/includes/http/Request.php @@ -57,13 +57,7 @@ class Vtiger_Request { } } if($isJSON) { - $oldValue = Zend_Json::$useBuiltinEncoderDecoder; - Zend_Json::$useBuiltinEncoderDecoder = false; - $decodeValue = Zend_Json::decode($value); - if(isset($decodeValue)) { - $value = $decodeValue; - } - Zend_Json::$useBuiltinEncoderDecoder = $oldValue; + $value = json_decode($value, true); } //Handled for null because vtlib_purify returns empty string diff --git a/modules/CustomView/models/Record.php b/modules/CustomView/models/Record.php index 4137274805b443c5be14dc400e9165eaa188650f..6440b49e5855aa667858b401e76c6d27f39a09de 100644 --- a/modules/CustomView/models/Record.php +++ b/modules/CustomView/models/Record.php @@ -457,7 +457,8 @@ class CustomView_Record_Model extends Vtiger_Base_Model { $db->pquery('DELETE FROM vtiger_cv2group WHERE cvid=?',array($cvId)); $db->pquery('DELETE FROM vtiger_cv2role WHERE cvid=?',array($cvId)); $db->pquery('DELETE FROM vtiger_cv2rs WHERE cvid=?',array($cvId)); - $members = $this->get('members',array()); + $members = $this->get('members'); + if (!$members) $members = array(); $noOfMembers = count($members); for ($i = 0; $i < $noOfMembers; ++$i) { @@ -1287,4 +1288,4 @@ class CustomView_Record_Model extends Vtiger_Base_Model { } return $instance; } -} \ No newline at end of file +}