www

commit 6592124ef24cfc19e046e8d47be9f6b0f9052f4e
parent de7467a62ca1b1e8ac75ab9de720c53086c77ec1
Author: Dan Stillman <dstillman@zotero.org>
Date:   Fri, 10 Feb 2012 14:11:14 -0500

Merge branch '3.0'

Diffstat:
M
chrome/content/zotero/xpcom/connector/cachedTypes.js
 | 
2
+-

1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/chrome/content/zotero/xpcom/connector/cachedTypes.js b/chrome/content/zotero/xpcom/connector/cachedTypes.js
@@ -152,7 +152,7 @@ Zotero.Connector_Types = new function() {
 				return false;
 			};
 			
-			this.getBaseIDFromTypeAndField = function(itemType, fieldIdOrName) {
+			this.getBaseIDFromTypeAndField = function(typeIdOrName, fieldIdOrName) {
 				var field = fields[fieldIdOrName], itemType = itemTypes[typeIdOrName];
 				if(!field || !itemType) {
 					throw new Error("Invalid field or type ID");