Merge pull request #2269 from eileenmcnaughton/test-fixes

E-notice fix

diff --git a/CRM/Core/PseudoConstant.php b/CRM/Core/PseudoConstant.php
index 1a2630d3beebe313b587a8a3e9104c4d1ed4684f..bb9560614305e91f197b1e131b37b363141e6bd0 100644 (file)
--- 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),
       );