www

commit 263c54d09b7d0c682fce6310d186e785b918676a
parent 06a7b1438fd5c72adcf9854ca5db62a93509eda9
Author: Simon Kornblith <simon@simonster.com>
Date:   Tue, 17 Jul 2012 18:40:46 -0400

Merge branch '3.0'

Conflicts:
	chrome/content/zotero/locale/csl

Diffstat:
M
chrome/content/zotero/tools/testTranslators/translatorTester.js
 | 
3
++-

1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/chrome/content/zotero/tools/testTranslators/translatorTester.js b/chrome/content/zotero/tools/testTranslators/translatorTester.js
@@ -452,7 +452,8 @@ Zotero_TranslatorTester.prototype._runTestTranslate = function(translate, transl
 	if(!translators.length) {
 		testDoneCallback(this, test, "failed", "Detection failed");
 		return;
-	} else if(this.type === "web" && (translators[0].itemType !== "multiple" && test.items.length > 1 ||
+	} else if(this.type === "web" && translators[0].itemType !== "server"
+			&& (translators[0].itemType !== "multiple" && test.items.length > 1 ||
 			test.items.length === 1 && translators[0].itemType !== test.items[0].itemType)) {
 				// this handles "items":"multiple" too, since the string has length 8
 		testDoneCallback(this, test, "failed", "Detection returned wrong item type");