From 9e6d6c53763f4aeacd4aa5952eaaf69c86933df3 Mon Sep 17 00:00:00 2001
From: Dan Stillman <dstillman@zotero.org>
Date: Sat, 15 Sep 2007 19:38:50 +0000
Subject: [PATCH] Closes #642, Site-specific Quick Copy setting should apply to
 shortcut key

---
 chrome/content/zotero/overlay.js         | 3 ++-
 chrome/content/zotero/xpcom/quickCopy.js | 1 -
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/chrome/content/zotero/overlay.js b/chrome/content/zotero/overlay.js
index cc65876a4..1fcdb47fc 100644
--- a/chrome/content/zotero/overlay.js
+++ b/chrome/content/zotero/overlay.js
@@ -1113,7 +1113,8 @@ var ZoteroPane = new function()
 			return;
 		}
 		
-		var [mode, format] = Zotero.Prefs.get("export.quickCopy.setting").split('=');
+		var url = window.content.location.href;
+		var [mode, format] = Zotero.QuickCopy.getFormatFromURL(url).split('=');
 		
 		if (mode == 'bibliography') {
 			if (asCitations) {
diff --git a/chrome/content/zotero/xpcom/quickCopy.js b/chrome/content/zotero/xpcom/quickCopy.js
index 0d59d03c1..94f5b555e 100644
--- a/chrome/content/zotero/xpcom/quickCopy.js
+++ b/chrome/content/zotero/xpcom/quickCopy.js
@@ -46,7 +46,6 @@ Zotero.QuickCopy = new function() {
 		}
 		catch (e) {
 			return Zotero.Prefs.get("export.quickCopy.setting");
-			return;
 		}
 		
 		var matches = [];