Fix pseudoconstant regression

diff --git a/CRM/Core/PseudoConstant.php b/CRM/Core/PseudoConstant.php
index 2cabc11fb212ab2360931ad0808e07e790262889..32a177bac88b87aaaf4bba046a39bb78ab897060 100644 (file)
--- a/CRM/Core/PseudoConstant.php
+++ b/CRM/Core/PseudoConstant.php
@@ -326,7 +326,9 @@ class CRM_Core_PseudoConstant {
             return FALSE;
           }
           // Get list of fields for the option table
-          $availableFields = array_keys($fieldKeys);
+          $dao = new $daoName;
+          $availableFields = array_keys($dao->fieldKeys());
+          $dao->free();
 
           $select = "SELECT %1 AS id, %2 AS label";
           $from = "FROM %3";