From da789efca0d6e60eac015318583f1a795b9f9d90 Mon Sep 17 00:00:00 2001 From: Coleman Watts Date: Thu, 2 Jan 2014 20:42:19 -0800 Subject: [PATCH] CRM-12464 - Pseudoconstant - Skip default condition in validate context --- CRM/Core/PseudoConstant.php | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/CRM/Core/PseudoConstant.php b/CRM/Core/PseudoConstant.php index 1a2630d3be..bb95606143 100644 --- a/CRM/Core/PseudoConstant.php +++ b/CRM/Core/PseudoConstant.php @@ -303,7 +303,8 @@ class CRM_Core_PseudoConstant { $pseudoconstant = $fieldSpec['pseudoconstant']; // Merge params with schema defaults $params += array( - 'condition' => CRM_Utils_Array::value('condition', $pseudoconstant, array()), + // Skip default condition in validate context + 'condition' => $context == 'validate' ? array() : CRM_Utils_Array::value('condition', $pseudoconstant, array()), 'keyColumn' => CRM_Utils_Array::value('keyColumn', $pseudoconstant), 'labelColumn' => CRM_Utils_Array::value('labelColumn', $pseudoconstant), ); -- 2.25.1