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:
e8b1c88
)
CRM-12472 - Custom tables being needlessly left joined into reports if they include...
author
eileen
<eileen@fuzion.co.nz>
Tue, 30 Apr 2013 10:12:44 +0000
(22:12 +1200)
committer
eileen
<eileen@fuzion.co.nz>
Tue, 30 Apr 2013 10:12:44 +0000
(22:12 +1200)
CRM/Report/Form.php
patch
|
blob
|
blame
|
history
diff --git
a/CRM/Report/Form.php
b/CRM/Report/Form.php
index fef2c7232c8699097de16aaab6c2639961ec0a6e..296afcd100e50d48dbfc095d390188bf43ff9185 100644
(file)
--- a/
CRM/Report/Form.php
+++ b/
CRM/Report/Form.php
@@
-2817,8
+2817,10
@@
LEFT JOIN civicrm_contact {$field['alias']} ON {$field['alias']}.id = {$this->_a
foreach (array(
'value', 'min', 'max', 'relative', 'from', 'to') as $attach) {
if (isset($this->_params[$fieldAlias . '_' . $attach]) &&
- (!empty($this->_params[$fieldAlias . '_' . $attach]) || $this->_params[$fieldAlias . '_' . $attach] == '0')
- ) {
+ (!empty($this->_params[$fieldAlias . '_' . $attach])
+ || ($attach != 'relative' && $this->_params[$fieldAlias . '_' . $attach] == '0')
+ )
+ ){
return TRUE;
}
}