From 2e02f487e14936e4d76f643780eb9fb9a3d6881f Mon Sep 17 00:00:00 2001
From: Coleman Watts <coleman@civicrm.org>
Date: Tue, 25 Feb 2014 16:02:01 -0500
Subject: [PATCH] Rename autocomplete term variable for consistency

---
 CRM/Admin/Page/AJAX.php          | 2 +-
 templates/CRM/Admin/Page/Tag.tpl | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/CRM/Admin/Page/AJAX.php b/CRM/Admin/Page/AJAX.php
index c1ba11fabf..92cf2a1ef5 100644
--- a/CRM/Admin/Page/AJAX.php
+++ b/CRM/Admin/Page/AJAX.php
@@ -291,7 +291,7 @@ class CRM_Admin_Page_AJAX {
   }
 
   static function mergeTagList() {
-    $name = CRM_Utils_Type::escape($_GET['s'], 'String');
+    $name = CRM_Utils_Type::escape($_GET['term'], 'String');
     $fromId = CRM_Utils_Type::escape($_GET['fromId'], 'Integer');
     $limit = CRM_Core_BAO_Setting::getItem(CRM_Core_BAO_Setting::SYSTEM_PREFERENCES_NAME, 'search_autocomplete_count', NULL, 10);
 
diff --git a/templates/CRM/Admin/Page/Tag.tpl b/templates/CRM/Admin/Page/Tag.tpl
index fa8e0b12c7..8e17b11f24 100644
--- a/templates/CRM/Admin/Page/Tag.tpl
+++ b/templates/CRM/Admin/Page/Tag.tpl
@@ -123,7 +123,7 @@ cj(function($) {
             ajax: {
               url: tagUrl,
               data: function(term) {
-                return {s: term, fromId: tag.id};
+                return {term: term, fromId: tag.id};
               },
               results: function(response) {
                 return {results: response};
-- 
2.25.1