Merge branch '4.0' into api_syncing

This commit is contained in:
Dan Stillman 2015-03-16 23:40:57 -04:00
commit bdd69d0a53
331 changed files with 6214 additions and 2627 deletions

View file

@ -82,7 +82,7 @@ ZoteroAutoComplete.prototype.startSearch = Zotero.Promise.coroutine(function* (s
+ "SELECT tagID FROM itemTags WHERE itemID = ?))";
sqlParams.push(searchParams.itemID);
}
sql += " ORDER BY name COLLATE locale";
sql += " ORDER BY val COLLATE locale";
break;
case 'creator':