From c8ef633ba75008a698940edff19dde624c490aa0 Mon Sep 17 00:00:00 2001
From: "Donald A. Lobo" <lobo@civicrm.org>
Date: Wed, 1 May 2013 08:50:46 -0700
Subject: [PATCH] CRM-12475

----------------------------------------
* CRM-12475: Advanced search for CiviCRM ID fails
  http://issues.civicrm.org/jira/browse/CRM-12475
---
 CRM/Contact/Form/Search/Criteria.php                 | 4 ++--
 templates/CRM/Contact/Form/Search/Criteria/Basic.tpl | 4 ++--
 templates/CRM/common/Navigation.tpl                  | 4 ++--
 3 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/CRM/Contact/Form/Search/Criteria.php b/CRM/Contact/Form/Search/Criteria.php
index 888d5c8ac7..b79ce20eda 100644
--- a/CRM/Contact/Form/Search/Criteria.php
+++ b/CRM/Contact/Form/Search/Criteria.php
@@ -114,7 +114,7 @@ class CRM_Contact_Form_Search_Criteria {
 
 
     //added internal ID
-    $form->addElement('text', 'id', ts('Contact ID'), CRM_Core_DAO::getAttribute('CRM_Contact_DAO_Contact', 'id'));
+    $form->addElement('text', 'contact_id', ts('Contact ID'), CRM_Core_DAO::getAttribute('CRM_Contact_DAO_Contact', 'id'));
 
     //added external ID
     $form->addElement('text', 'external_identifier', ts('External ID'), CRM_Core_DAO::getAttribute('CRM_Contact_DAO_Contact', 'external_identifier'));
@@ -368,7 +368,7 @@ class CRM_Contact_Form_Search_Criteria {
     }
 
     CRM_Core_BAO_Address::addStateCountryMap($stateCountryMap);
-    
+
     // extend addresses with proximity search
     $form->addElement('text', 'prox_distance', ts('Find contacts within'));
     $form->addElement('select', 'prox_distance_unit', NULL, array('miles' => ts('Miles'), 'kilos' => ts('Kilometers')));
diff --git a/templates/CRM/Contact/Form/Search/Criteria/Basic.tpl b/templates/CRM/Contact/Form/Search/Criteria/Basic.tpl
index c2adad4252..2733a67b71 100644
--- a/templates/CRM/Contact/Form/Search/Criteria/Basic.tpl
+++ b/templates/CRM/Contact/Form/Search/Criteria/Basic.tpl
@@ -244,8 +244,8 @@
   </tr>
   <tr>
     <td>
-       {$form.id.label} {help id="id-internal-id" file="CRM/Contact/Form/Contact"}<br />
-       {$form.id.html}
+       {$form.contact_id.label} {help id="id-internal-id" file="CRM/Contact/Form/Contact"}<br />
+       {$form.contact_id.html}
     </td>
     <td>
        {$form.external_identifier.label} {help id="id-external-id" file="CRM/Contact/Form/Contact"}<br />
diff --git a/templates/CRM/common/Navigation.tpl b/templates/CRM/common/Navigation.tpl
index 799acb6b14..79fa03aeb3 100644
--- a/templates/CRM/common/Navigation.tpl
+++ b/templates/CRM/common/Navigation.tpl
@@ -38,7 +38,7 @@
             </form>
           <ul>
             <li><label class="crm-quickSearchField"><input type="radio" checked="" data-tablename="cc" checked="checked" value="" name="quickSearchField">{ts}Name/Email{/ts}</label></li>
-            <li><label class="crm-quickSearchField"><input type="radio" data-tablename="cc" value="id" name="quickSearchField">{ts}CiviCRM ID{/ts}</label></li>
+            <li><label class="crm-quickSearchField"><input type="radio" data-tablename="cc" value="contact_id" name="quickSearchField">{ts}CiviCRM ID{/ts}</label></li>
             <li><label class="crm-quickSearchField"><input type="radio" data-tablename="cc" value="external_identifier" name="quickSearchField">{ts}External ID{/ts}</label></li>
             <li><label class="crm-quickSearchField"><input type="radio" data-tablename="cc" value="first_name" name="quickSearchField">{ts}First Name{/ts}</label></li>
             <li><label class="crm-quickSearchField"><input type="radio" data-tablename="cc" value="last_name" name="quickSearchField">{ts}Last Name{/ts}</label></li>
@@ -141,7 +141,7 @@ cj(function( ) {
   else {
     cj("#menu-container").show().css({'padding-bottom': '10px'});
   }
-  
+
   cj('#civicrm-menu').ready(function() {
     cj('#root-menu-div .outerbox').css({ 'margin-top': '6px'});
     cj('#root-menu-div .outerbox').first().css({ 'margin-top': '20px'});
-- 
2.25.1