projects
/
civicrm-core.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
ceb61cf
)
CRM-16640 - CiviReport - fix error when selecting email addresses on activity report
author
Jon goldberg
<jon@palantetech.coop>
Sun, 7 Jun 2015 18:04:26 +0000
(14:04 -0400)
committer
Jon goldberg
<jon@palantetech.coop>
Sun, 7 Jun 2015 18:04:26 +0000
(14:04 -0400)
CRM/Report/Form/Activity.php
patch
|
blob
|
blame
|
history
diff --git
a/CRM/Report/Form/Activity.php
b/CRM/Report/Form/Activity.php
index d3bbdfb13fb5f95d2de60e577dc209b9b803419b..9f1e6e0d3b0f0900b047a082bdb9e1076a92d907 100644
(file)
--- 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();