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:
178774f
)
Enotice fix from recent merge
author
eileen
<emcnaughton@wikimedia.org>
Sun, 26 Feb 2017 03:56:59 +0000
(16:56 +1300)
committer
eileen
<emcnaughton@wikimedia.org>
Sun, 26 Feb 2017 03:56:59 +0000
(16:56 +1300)
CRM/Contact/BAO/Query.php
patch
|
blob
|
blame
|
history
diff --git
a/CRM/Contact/BAO/Query.php
b/CRM/Contact/BAO/Query.php
index 5874379f8a960f88bc031a881f3149f2b0981f6e..e905154411da95ee7a2536cae69c1376c84cb407 100644
(file)
--- a/
CRM/Contact/BAO/Query.php
+++ b/
CRM/Contact/BAO/Query.php
@@
-5908,7
+5908,7
@@
AND displayRelType.is_active = 1
// This is a temporary routine for handling these fields while
// we figure out how to handled them based on metadata in
/// export and search builder. CRM-19815, CRM-19830.
- if (isset($dao->$realField) && is_numeric($dao->$realField)) {
+ if (isset($dao->$realField) && is_numeric($dao->$realField)
&& isset($dao->$labelField)
) {
$dao->$realField = $dao->$labelField;
}
}