From 94b2865149391b391e9af394508df5c948ffcd86 Mon Sep 17 00:00:00 2001
From: Dan Stillman <dstillman@zotero.org>
Date: Wed, 25 Feb 2015 23:58:54 -0500
Subject: [PATCH] Fix sorting of tag autocomplete in advanced search

---
 components/zotero-autocomplete.js | 19 +------------------
 1 file changed, 1 insertion(+), 18 deletions(-)

diff --git a/components/zotero-autocomplete.js b/components/zotero-autocomplete.js
index 331cdb144..05978b063 100644
--- a/components/zotero-autocomplete.js
+++ b/components/zotero-autocomplete.js
@@ -84,18 +84,8 @@ ZoteroAutoComplete.prototype.startSearch = function(searchString, searchParams,
 					+ "SELECT tagID FROM itemTags WHERE itemID = ?))";
 				sqlParams.push(searchParams.itemID);
 			}
-			
+			sql += " ORDER BY val COLLATE locale";
 			statement = this._zotero.DB.getStatement(sql, sqlParams);
-			
-			var resultsCallback = function (results) {
-				if (!results) {
-					return;
-				}
-				var collation = self._zotero.getLocaleCollation();
-				results.sort(function(a, b) {
-					return collation.compareString(1, a.val, b.val);
-				});
-			}
 			break;
 		
 		case 'creator':
@@ -246,13 +236,6 @@ ZoteroAutoComplete.prototype.startSearch = function(searchString, searchParams,
 				}
 			}
 			
-			if (resultsCallback) {
-				if (comments.length) {
-					throw ("Cannot sort results with comments in ZoteroAutoComplete.startSearch()");
-				}
-				resultsCallback(results);
-			}
-			
 			self.updateResults(results, comments, true);
 		},