From: Coleman Watts <coleman@civicrm.org>
Date: Thu, 18 Jul 2013 00:08:19 +0000 (-0700)
Subject: Fix pseudoconstant regression
X-Git-Url: https://vcs.fsf.org/?a=commitdiff_plain;h=7ae0389fb172a812b137b78f5f51f01065f83070;p=civicrm-core.git

Fix pseudoconstant regression
---

diff --git a/CRM/Core/PseudoConstant.php b/CRM/Core/PseudoConstant.php
index 2cabc11fb2..32a177bac8 100644
--- 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";