From 96b84142a93631de44c52e5f533201ac0a7adb14 Mon Sep 17 00:00:00 2001 From: Pradeep Nayak Date: Mon, 11 Feb 2019 12:55:30 +0000 Subject: [PATCH 1/2] dev/core/issues/708, Fix Qill for Added by and Modified By --- CRM/Contact/BAO/Query.php | 16 +++++++++++++++- 1 file changed, 15 insertions(+), 1 deletion(-) diff --git a/CRM/Contact/BAO/Query.php b/CRM/Contact/BAO/Query.php index 2db3cb961640..3c99db2d6a58 100644 --- a/CRM/Contact/BAO/Query.php +++ b/CRM/Contact/BAO/Query.php @@ -3899,7 +3899,21 @@ public function changeLog(&$values) { $name = $targetName[4] ? "%$name%" : $name; $this->_where[$grouping][] = "contact_b_log.sort_name LIKE '%$name%'"; $this->_tables['civicrm_log'] = $this->_whereTables['civicrm_log'] = 1; - $this->_qill[$grouping][] = ts('Modified By') . " $name"; + $fieldTitle = ts('Added By'); + foreach ($this->_params as $params) { + if ($params[0] == 'log_date') { + if ($params[2] == 2) { + $fieldTitle = ts('Modified By'); + } + break; + } + } + list($qillop, $qillVal) = self::buildQillForFieldValue(NULL, 'changed_by', $name, 'LIKE'); + $this->_qill[$grouping][] = ts("%1 %2 %3", [ + 1 => $fieldTitle, + 2 => $qillop, + 3 => $qillVal, + ]); } /** From b478616b169707369d6b2a580af2aa3c3ebe5347 Mon Sep 17 00:00:00 2001 From: Pradeep Nayak Date: Thu, 14 Feb 2019 23:10:09 +0000 Subject: [PATCH 2/2] added qoutes --- CRM/Contact/BAO/Query.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CRM/Contact/BAO/Query.php b/CRM/Contact/BAO/Query.php index 3c99db2d6a58..31e249809ffc 100644 --- a/CRM/Contact/BAO/Query.php +++ b/CRM/Contact/BAO/Query.php @@ -3909,7 +3909,7 @@ public function changeLog(&$values) { } } list($qillop, $qillVal) = self::buildQillForFieldValue(NULL, 'changed_by', $name, 'LIKE'); - $this->_qill[$grouping][] = ts("%1 %2 %3", [ + $this->_qill[$grouping][] = ts("%1 %2 '%3'", [ 1 => $fieldTitle, 2 => $qillop, 3 => $qillVal,