format fixes

diff --git a/CRM/Activity/Form/Search.php b/CRM/Activity/Form/Search.php
index a424957461357d4064f51ef7989700fca742fbdf..3b81aead8aaa928cf3771efe28149638e5f4dd9e 100644 (file)
--- 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 f75aa7ed60d37838ac66abb5410f1782b4cc06b9..021f5917e6a80718a3c969bacd31fe5f6ef8b7f0 100644 (file)
--- 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));
         }
       }
     }