1. escape grid wise search input, 2. correctify search column numbers

diff --git a/CRM/Contact/Page/AJAX.php b/CRM/Contact/Page/AJAX.php
index 50e0d31ccea67f663ca110e22b096724e125d103..fea8d422eeefd1be6b5e4a156c93c77df4aa120b 100644 (file)
--- a/CRM/Contact/Page/AJAX.php
+++ b/CRM/Contact/Page/AJAX.php
@@ -695,6 +695,8 @@ LIMIT {$offset}, {$rowCount}
     $join  = '';
     $where = array();
     $searchData = CRM_Utils_Array::value('search', $_REQUEST);
+    $searchData['value'] = CRM_Utils_Type::escape($searchData['value'], 'String');
+
     if ($src || !empty($searchData['value']) ) {
       $src = $src ? $src : $searchData['value'];
       $where[] = " cc1.display_name LIKE '%{$src}%'";

diff --git a/templates/CRM/Contact/Page/DedupeFind.tpl b/templates/CRM/Contact/Page/DedupeFind.tpl
index 003f95b0490e63496677384914a35c055983ecf3..a24057f8a3e6cf54bf8e04378a9c9fca727851b2 100644 (file)
--- a/templates/CRM/Contact/Page/DedupeFind.tpl
+++ b/templates/CRM/Contact/Page/DedupeFind.tpl
@@ -38,11 +38,11 @@
           </td>
           <td class="crm-contact-form-block-contact2">
             <label for="contact2">{ts}Contact 2{/ts}</label><br />
-            <input type="text" placeholder="Search Contact2" search-column="5" />
+            <input type="text" placeholder="Search Contact2" search-column="4" />
           </td>
           <td class="crm-contact-form-block-email1">
             <label for="email1">{ts}Email 1{/ts}</label><br />
-            <input type="text" placeholder="Search Email1" search-column="3" />
+            <input type="text" placeholder="Search Email1" search-column="5" />
           </td>
           <td class="crm-contact-form-block-email2">
             <label for="email2">{ts}Email 2{/ts}</label><br />
@@ -85,7 +85,7 @@
     <input type='checkbox' id ='crm-dedupe-display-selection' name="display-selection">
     <label for="display-selection">{ts}Within Selections{/ts}&nbsp;</label>  
   </span>
-  <table id="dupePairs" class="nestedActivitySelector form-layout-compressed" cellspacing="0" width="100%">
+  <table id="dupePairs" class="form-layout-compressed" cellspacing="0" width="100%">
     <thead>
       <tr class="columnheader"> 
         <th class="crm-dedupe-selection"><input type="checkbox" value="0" name="pnid_all" class="crm-dedupe-select-all"></th>