From: Jon goldberg Date: Sun, 7 Jun 2015 18:04:26 +0000 (-0400) Subject: CRM-16640 - CiviReport - fix error when selecting email addresses on activity report X-Git-Url: https://vcs.fsf.org/?a=commitdiff_plain;h=626390156af28fde2fa6845f4dc09896070bc6fb;p=civicrm-core.git CRM-16640 - CiviReport - fix error when selecting email addresses on activity report --- diff --git a/CRM/Report/Form/Activity.php b/CRM/Report/Form/Activity.php index d3bbdfb13f..9f1e6e0d3b 100644 --- a/CRM/Report/Form/Activity.php +++ b/CRM/Report/Form/Activity.php @@ -518,7 +518,7 @@ class CRM_Report_Form_Activity extends CRM_Report_Form { } $this->_aliases['civicrm_contact'] = 'civicrm_contact_source'; } - $this->_from .= "INNER JOIN civicrm_option_value {$this->_aliases['civicrm_option_value']} + $this->_from .= " INNER JOIN civicrm_option_value {$this->_aliases['civicrm_option_value']} ON {$this->_aliases['civicrm_option_value']}.option_group_id = {$activityTypeId} AND {$this->_aliases['civicrm_option_value']}.value = {$this->_aliases['civicrm_activity']}.activity_type_id"; $this->addAddressFromClause();