From 6c7c8a66c0c24f2e2d841f7bda46b1f72bf207a9 Mon Sep 17 00:00:00 2001
From: Simon Kornblith <simon@simonster.com>
Date: Sat, 12 Feb 2011 20:40:46 +0000
Subject: [PATCH] - don't try to open non-native attachments using Fx - don't
 try to get non-existent strings for non-existent buttons

---
 chrome/content/zotero/bindings/attachmentbox.xml | 8 --------
 chrome/content/zotero/zoteroPane.js              | 2 +-
 2 files changed, 1 insertion(+), 9 deletions(-)

diff --git a/chrome/content/zotero/bindings/attachmentbox.xml b/chrome/content/zotero/bindings/attachmentbox.xml
index b952541611..2f250e8a91 100644
--- a/chrome/content/zotero/bindings/attachmentbox.xml
+++ b/chrome/content/zotero/bindings/attachmentbox.xml
@@ -187,13 +187,6 @@
 					// Metadata for URL's
 					if (this.item.attachmentLinkMode == Zotero.Attachments.LINK_MODE_LINKED_URL
 							|| isImportedURL) {
-						// "View Page"/"View Snapshot" label
-						if (isImportedURL) {
-							var str = Zotero.getString('pane.item.attachments.view.snapshot');
-						}
-						else {
-							var str = Zotero.getString('pane.item.attachments.view.link');
-						}
 						
 						// URL
 						if (this.displayURL) {
@@ -229,7 +222,6 @@
 					}
 					// Metadata for files
 					else {
-						var str = Zotero.getString('pane.item.attachments.view.file');
 						urlField.hidden = true;
 						accessed.hidden = true;
 					}
diff --git a/chrome/content/zotero/zoteroPane.js b/chrome/content/zotero/zoteroPane.js
index 4e6a2a3916..2b58f04687 100644
--- a/chrome/content/zotero/zoteroPane.js
+++ b/chrome/content/zotero/zoteroPane.js
@@ -3073,7 +3073,7 @@ var ZoteroPane = new function()
 					(!Zotero.MIME.hasInternalHandler(mimeType, ext) || Zotero.Prefs.get('launchNonNativeFiles')));
 			}
 			
-			if (!forceExternalViewer) {
+			if (!externalViewer) {
 				var url = 'zotero://attachment/' + itemID + '/';
 				this.loadURI(url, event, { attachmentID: itemID});
 			}