From a042295027f3a5f2f3ed1eb5ada88906dfc7c4bc Mon Sep 17 00:00:00 2001
From: Matus <sopko@its4you.sk>
Date: Tue, 12 May 2020 12:57:32 +0200
Subject: [PATCH] Picklist values colors disappear after search
---
modules/Settings/Picklist/models/Module.php | 2 +-
modules/Vtiger/helpers/Util.php | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/modules/Settings/Picklist/models/Module.php b/modules/Settings/Picklist/models/Module.php
index 4442b0ca4..4194034cd 100644
--- a/modules/Settings/Picklist/models/Module.php
+++ b/modules/Settings/Picklist/models/Module.php
@@ -510,7 +510,7 @@ class Settings_Picklist_Module_Model extends Vtiger_Module_Model {
$picklistNameRaw = $db->query_result($result, $i, $fieldName);
$picklistName = decode_html($picklistNameRaw);
// show color only for accesable picklist values
- if($isRoleBasedPicklist && !isset($accessablePicklistValues[$picklistNameRaw])) {
+ if($isRoleBasedPicklist && !isset($accessablePicklistValues[$picklistName ])) {
$color = '';
}
if(!empty($color)) {
diff --git a/modules/Vtiger/helpers/Util.php b/modules/Vtiger/helpers/Util.php
index ff7856806..f8a6f217b 100644
--- a/modules/Vtiger/helpers/Util.php
+++ b/modules/Vtiger/helpers/Util.php
@@ -1239,7 +1239,7 @@ class Vtiger_Util_Helper {
public static function convertSpaceToHyphen($string) {
if (!empty($string)) {
- return str_replace(" ", "-", $string);
+ return str_replace(" ", "-", decode_html($string));
}
}
--
GitLab