projects
/
civicrm-core.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge pull request #15528 from eileenmcnaughton/report_page
[civicrm-core.git]
/
CRM
/
Case
/
BAO
/
Query.php
diff --git
a/CRM/Case/BAO/Query.php
b/CRM/Case/BAO/Query.php
index 321118bf96e74613625e82dd299eff8ff4338cfe..3db0adee600152aefe70f4492b3de3d6f7d55cdd 100644
(file)
--- a/
CRM/Case/BAO/Query.php
+++ b/
CRM/Case/BAO/Query.php
@@
-481,7
+481,14
@@
class CRM_Case_BAO_Query extends CRM_Core_BAO_Query {
$tags = CRM_Core_PseudoConstant::get('CRM_Core_DAO_EntityTag', 'tag_id', ['onlyActive' => FALSE]);
if (!empty($value)) {
$tags = CRM_Core_PseudoConstant::get('CRM_Core_DAO_EntityTag', 'tag_id', ['onlyActive' => FALSE]);
if (!empty($value)) {
- $val = explode(',', $value);
+ if (is_array($value)) {
+ // Search tag(s) are part of a tag set
+ $val = array_keys($value);
+ }
+ else {
+ // Search tag(s) are part of the tag tree
+ $val = explode(',', $value);
+ }
foreach ($val as $v) {
if ($v) {
$names[] = $tags[$v];
foreach ($val as $v) {
if ($v) {
$names[] = $tags[$v];