From c0b97e339a05bbebbb088a5df4f48bdf149e5284 Mon Sep 17 00:00:00 2001
From: Dan Stillman <dstillman@zotero.org>
Date: Sat, 28 Nov 2009 16:37:11 +0000
Subject: [PATCH] Apply modified version of Frank's OpenURL patch: Append '&'
 if OpenURL resolver URL already has '?' in it

---
 chrome/content/zotero/xpcom/ingester.js | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/chrome/content/zotero/xpcom/ingester.js b/chrome/content/zotero/xpcom/ingester.js
index 4f57caace0..8ab5809d1e 100644
--- a/chrome/content/zotero/xpcom/ingester.js
+++ b/chrome/content/zotero/xpcom/ingester.js
@@ -76,7 +76,10 @@ Zotero.OpenURL = new function() {
 	function resolve(itemObject) {
 		var co = createContextObject(itemObject, Zotero.Prefs.get("openURL.version"));
 		if(co) {
-			return Zotero.Prefs.get("openURL.resolver")+"?"+co;
+			var base = Zotero.Prefs.get("openURL.resolver");
+			// Add & if there's already a ?
+			var splice = base.indexOf("?") == -1 ? "?" : "&";
+			return base + splice + co;
 		}
 		return false;
 	}