From e940f8a3199863916ff5b42332eb8d418dafb588 Mon Sep 17 00:00:00 2001
From: Prasad <prasad@vtiger.com>
Date: Wed, 5 Feb 2020 09:32:57 +0530
Subject: [PATCH] Pulled: commit bca6a86d87bbc172f9b9a099b7850d5ed5d6d2a6

---
 modules/Vtiger/helpers/Util.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/modules/Vtiger/helpers/Util.php b/modules/Vtiger/helpers/Util.php
index 97bbb292a..bda04b35c 100644
--- a/modules/Vtiger/helpers/Util.php
+++ b/modules/Vtiger/helpers/Util.php
@@ -1257,13 +1257,13 @@ class Vtiger_Util_Helper {
         $fieldInfo = $fieldModel->getFieldInfo();
         $editablePicklistValues = $fieldInfo['editablepicklistvalues'];
         if($fieldValue && $fieldDataType == 'picklist'){
-           if(!empty($editablePicklistValues) && !in_array($fieldValue, $editablePicklistValues)){
+           if(!empty($editablePicklistValues) && !isset($editablePicklistValues[$fieldValue])){
                 $fieldValue = null;
             }
         }elseif(count($fieldValue) > 0 && $fieldDataType == 'multipicklist'){
             if(!empty($editablePicklistValues)){
                 foreach($fieldValue as $key => $value){
-                    if(!in_array($value, $editablePicklistValues)){
+                    if(!isset($editablePicklistValues[$fieldValue])){
                         unset($fieldValue[$key]);
                     }
                 }
-- 
GitLab