Skip to content
Snippets Groups Projects
Commit 16d7d41c authored by Apparao G's avatar Apparao G
Browse files

#1792:Special characters in inputs not supported across the CRM

parent de1a1817
No related branches found
No related tags found
No related merge requests found
...@@ -3125,6 +3125,7 @@ class TrackableObject implements ArrayAccess, IteratorAggregate { ...@@ -3125,6 +3125,7 @@ class TrackableObject implements ArrayAccess, IteratorAggregate {
} }
function offsetSet($key, $value) { function offsetSet($key, $value) {
if(is_array($value)) $value = empty($value) ? "" : $value[0];
if($this->tracking && $this->trackingEnabled) { if($this->tracking && $this->trackingEnabled) {
$olderValue = $this->offsetGet($key); $olderValue = $this->offsetGet($key);
// decode_html only expects string // decode_html only expects string
......
...@@ -72,13 +72,8 @@ class Vtiger_Request implements ArrayAccess { ...@@ -72,13 +72,8 @@ class Vtiger_Request implements ArrayAccess {
} }
} }
if($isJSON) { if($isJSON) {
$oldValue = Zend_Json::$useBuiltinEncoderDecoder;
Zend_Json::$useBuiltinEncoderDecoder = false;
$decodeValue = json_decode($value, true); $decodeValue = json_decode($value, true);
if(isset($decodeValue)) { $value = json_last_error() ? $value : $decodeValue;
$value = $decodeValue;
}
Zend_Json::$useBuiltinEncoderDecoder = $oldValue;
} }
//Handled for null because vtlib_purify returns empty string //Handled for null because vtlib_purify returns empty string
......
...@@ -139,6 +139,7 @@ class CheckDuplicateHandler extends VTEventHandler { ...@@ -139,6 +139,7 @@ class CheckDuplicateHandler extends VTEventHandler {
$fieldValue = $uniqueFieldsData[$fieldName]; $fieldValue = $uniqueFieldsData[$fieldName];
if (isset($fieldValue)) { if (isset($fieldValue)) {
if(is_array($fieldValue)) $fieldValue = empty($fieldValue) ? "" : $fieldValue;
array_push($conditions, "$fieldTableName.$fieldColumnName = ?"); array_push($conditions, "$fieldTableName.$fieldColumnName = ?");
} else { } else {
$fieldValue = ''; $fieldValue = '';
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment