From: Coleman Watts <coleman@civicrm.org>
Date: Mon, 29 Jul 2013 17:29:56 +0000 (-0700)
Subject: Pass context from pseudoconstant getKey/getValue CRM-12464
X-Git-Url: https://vcs.fsf.org/?a=commitdiff_plain;h=6d83b4ca94d632e051793bad54d58dbd71a35316;p=civicrm-core.git

Pass context from pseudoconstant getKey/getValue CRM-12464

----------------------------------------
* CRM-12464: Add PseudoConstants to Schema Metadata
  http://issues.civicrm.org/jira/browse/CRM-12464
---

diff --git a/CRM/Core/PseudoConstant.php b/CRM/Core/PseudoConstant.php
index cf7df6d713..097cfa3d3b 100644
--- a/CRM/Core/PseudoConstant.php
+++ b/CRM/Core/PseudoConstant.php
@@ -453,7 +453,7 @@ class CRM_Core_PseudoConstant {
    *   String if label is found
    */
   static function getValue($daoName, $fieldName, $key, $params = array()) {
-    $values = self::get($daoName, $fieldName, $params);
+    $values = self::get($daoName, $fieldName, $params, 'get');
     if ($values === FALSE) {
       return FALSE;
     }
@@ -461,7 +461,7 @@ class CRM_Core_PseudoConstant {
   }
 
   /**
-   * Fetch the key for a field option given its label/name
+   * Fetch the key for a field option given its name
    *
    * @param String $daoName
    * @param String $fieldName
@@ -474,7 +474,7 @@ class CRM_Core_PseudoConstant {
    *   String|Number if key is found
    */
   static function getKey($daoName, $fieldName, $value, $params = array()) {
-    $values = self::get($daoName, $fieldName, $params);
+    $values = self::get($daoName, $fieldName, $params, 'validate');
     if ($values === FALSE) {
       return FALSE;
     }