From: monishdeb Date: Fri, 11 Dec 2015 13:16:15 +0000 (+0530) Subject: format fixes X-Git-Url: https://vcs.fsf.org/?a=commitdiff_plain;h=0a63f5e591229212dad4f7f6902889e65afbc6ba;p=civicrm-core.git format fixes --- diff --git a/CRM/Activity/Form/Search.php b/CRM/Activity/Form/Search.php index a424957461..3b81aead8a 100644 --- a/CRM/Activity/Form/Search.php +++ b/CRM/Activity/Form/Search.php @@ -195,7 +195,7 @@ class CRM_Activity_Form_Search extends CRM_Core_Form_Search { $specialParams = array( 'activity_type_id', 'status_id', - 'activity_subject' + 'activity_subject', ); $changeNames = array('status_id' => 'activity_status_id'); CRM_Contact_BAO_Query::processSpecialFormValue($this->_formValues, $specialParams, $changeNames); diff --git a/CRM/Contact/BAO/Query.php b/CRM/Contact/BAO/Query.php index f75aa7ed60..021f5917e6 100644 --- a/CRM/Contact/BAO/Query.php +++ b/CRM/Contact/BAO/Query.php @@ -5896,9 +5896,6 @@ AND displayRelType.is_active = 1 * @return string */ public static function getWildCardedValue($wildcard, $op, $value) { - if (!$value) { - return; - } if ($wildcard && $op == 'LIKE') { if (CRM_Core_Config::singleton()->includeWildCardInName && (substr($value, 0, 1) != '%')) { return "%$value%"; @@ -5935,9 +5932,7 @@ AND displayRelType.is_active = 1 else { // if wildcard is already present return searchString as it is OR append and/or prepend with wildcard $isWilcard = strstr($value, '%') ? FALSE : CRM_Core_Config::singleton()->includeWildCardInName; - $formValues[$element] = array( - 'LIKE' => self::getWildCardedValue($isWilcard, 'LIKE', $value) - ); + $formValues[$element] = array('LIKE' => self::getWildCardedValue($isWilcard, 'LIKE', $value)); } } }