diff --git a/modules/Reports/ReportRun.php b/modules/Reports/ReportRun.php index cc3452b7701fd6d2c6deab5ff5b2124843f711fc..b174e293c18968d3517cb0fa0eb93fab84a7c700 100644 --- a/modules/Reports/ReportRun.php +++ b/modules/Reports/ReportRun.php @@ -381,7 +381,7 @@ class ReportRun extends CRMEntity { $selectedModuleFields[$module][] = $fieldname; $inventory_fields = array('serviceid'); $inventory_modules = getInventoryModules(); - if (sizeof($permitted_fields[$module]) == 0 && $is_admin == false && $profileGlobalPermission[1] == 1 && $profileGlobalPermission[2] == 1) { + if (empty($permitted_fields[$module]) && $is_admin == false && $profileGlobalPermission[1] == 1 && $profileGlobalPermission[2] == 1) { $permitted_fields[$module] = $this->getaccesfield($module); } if (in_array($module, $inventory_modules)) { @@ -4678,4 +4678,4 @@ class ReportRun extends CRMEntity { } -?> +?> \ No newline at end of file diff --git a/modules/Vtiger/helpers/Util.php b/modules/Vtiger/helpers/Util.php index f8a6f217b58e179535c28e9bbca7fc0aedb7c3d4..cfc0b801210b590db8f195d2727e1d547fb34906 100644 --- a/modules/Vtiger/helpers/Util.php +++ b/modules/Vtiger/helpers/Util.php @@ -1268,7 +1268,7 @@ class Vtiger_Util_Helper { if(!empty($editablePicklistValues) && !isset($editablePicklistValues[$fieldValue])){ $fieldValue = null; } - }elseif(count($fieldValue) > 0 && $fieldDataType == 'multipicklist'){ + }elseif(!empty($fieldValue) && $fieldDataType == 'multipicklist'){ if(!empty($editablePicklistValues)){ foreach($fieldValue as $key => $value){ if(!isset($editablePicklistValues[$fieldValue])){ @@ -1279,4 +1279,4 @@ class Vtiger_Util_Helper { } return $fieldValue; } -} +} \ No newline at end of file