CRM-15169

diff --git a/CRM/Report/Form/Contribute/HouseholdSummary.php b/CRM/Report/Form/Contribute/HouseholdSummary.php
index 3a8b7978bee9f5b381be2d19ba08c527833cbd91..d46e70704258bc2979075704c9983e00a65ad100 100644 (file)
--- a/CRM/Report/Form/Contribute/HouseholdSummary.php
+++ b/CRM/Report/Form/Contribute/HouseholdSummary.php
@@ -243,7 +243,7 @@ class CRM_Report_Form_Contribute_HouseholdSummary extends CRM_Report_Form {
               }
             }
             else {
-              $select[] = "{$table['alias']}.{$fieldName} as {$tableName}_{$fieldName}";
+              $select[] = "{$field['dbAlias']} as {$tableName}_{$fieldName}";
 
               $this->_columnHeaders["{$tableName}_{$fieldName}"]['title'] = CRM_Utils_Array::value('title', $field);
               $this->_columnHeaders["{$tableName}_{$fieldName}"]['type'] = CRM_Utils_Array::value('type', $field);

diff --git a/CRM/Report/Form/Contribute/OrganizationSummary.php b/CRM/Report/Form/Contribute/OrganizationSummary.php
index 7159cd9d96dbd6c0c246c533555356a8f4adecfb..160345197e5f3463078358c7a2e8516127a2cde6 100644 (file)
--- a/CRM/Report/Form/Contribute/OrganizationSummary.php
+++ b/CRM/Report/Form/Contribute/OrganizationSummary.php
@@ -244,7 +244,7 @@ class CRM_Report_Form_Contribute_OrganizationSummary extends CRM_Report_Form {
               }
             }
             else {
-              $select[] = "{$table['alias']}.{$fieldName} as {$tableName}_{$fieldName}";
+              $select[] = "{$field['dbAlias']} as {$tableName}_{$fieldName}";
 
               $this->_columnHeaders["{$tableName}_{$fieldName}"]['title'] = CRM_Utils_Array::value('title', $field);
               $this->_columnHeaders["{$tableName}_{$fieldName}"]['type'] = CRM_Utils_Array::value('type', $field);

diff --git a/CRM/Report/Form/Contribute/Repeat.php b/CRM/Report/Form/Contribute/Repeat.php
index ab2b2b7d912517ffb170efa8385262dde64934e1..8677285443621d075f4f8957455e721ad3dfa4cc 100644 (file)
--- a/CRM/Report/Form/Contribute/Repeat.php
+++ b/CRM/Report/Form/Contribute/Repeat.php
@@ -464,7 +464,7 @@ LEFT JOIN civicrm_temp_civireport_repeat2 {$this->_aliases['civicrm_contribution
    *
    * @return array
    */
-  function formRule($fields, $files, $self) {
+  static function formRule($fields, $files, $self) {
 
     $errors = $checkDate = $errorCount = array();
 
@@ -492,6 +492,7 @@ LEFT JOIN civicrm_temp_civireport_repeat2 {$this->_aliases['civicrm_contribution
 
     $idMapping = array(
       'id' => ts('Contact'),
+      'exposed_id' => ts('Contact'),
       'country_id' => ts('Country'),
       'state_province_id' => ts('State/Province'),
       'contribution_source' => ts('Contribution Source'),