Get export working

diff --git a/CRM/Contact/BAO/Query.php b/CRM/Contact/BAO/Query.php
index c9307175679b2b0dbdf34ba5b5672141bb194a02..2ac81c09a51c4a9e4c67313b30a6e9045c016a28 100644 (file)
--- a/CRM/Contact/BAO/Query.php
+++ b/CRM/Contact/BAO/Query.php
@@ -30,7 +30,7 @@
  * @package CRM
  * @copyright CiviCRM LLC (c) 2004-2013
  * $Id$
-nnnnnnnnn *
+ *
  */
 
 /**
@@ -587,6 +587,10 @@ class CRM_Contact_BAO_Query {
         continue;
       }
 
+      if ($field['pseudoconstant']) {
+        continue;
+      }
+
       // redirect to activity select clause
       if (substr($name, 0, 9) == 'activity_') {
         CRM_Activity_BAO_Query::select($this);
@@ -909,7 +913,7 @@ class CRM_Contact_BAO_Query {
           }
         }
 
-        // check if there is a value, if so also add to where Clause
+        // Check if there is a value, if so also add to where Clause
         $addWhere = FALSE;
         if ($this->_params) {
           $nm = $elementName;
@@ -1198,6 +1202,7 @@ class CRM_Contact_BAO_Query {
       $this->filterRelatedContacts($from, $where, $having);
     }
 
+    // CRM_Core_Error::debug($this);
     return array($select, $from, $where, $having);
   }
 

diff --git a/CRM/Core/OptionValue.php b/CRM/Core/OptionValue.php
index a665413d126b5722d4b62544d726ca230198b625..d54ff87f904ec896ec0751d085bfa1d2b7ad4341 100644 (file)
--- a/CRM/Core/OptionValue.php
+++ b/CRM/Core/OptionValue.php
@@ -371,8 +371,11 @@ class CRM_Core_OptionValue {
   static function select(&$query) {
     if (!empty($query->_params) || !empty($query->_returnProperties)) {
       $field = self::getFields();
-      foreach ($field as $name => $title) {
-        list($tableName, $fieldName) = explode('.', $title['where']);
+      foreach ($field as $name => $values) {
+        if ($values['pseudoconstant']) {
+          continue;
+        }
+        list($tableName, $fieldName) = explode('.', $values['where']);
         if (CRM_Utils_Array::value($name, $query->_returnProperties)) {
           $query->_select["{$name}_id"] = "{$name}.value as {$name}_id";
           $query->_element["{$name}_id"] = 1;