www

commit 0aa0966a28d01388e8c34b1896ec665f2fe4d310
parent 78b4c3c820c7560b573c34e35c27862891b4848f
Author: Simon Kornblith <simon@simonster.com>
Date:   Sun,  7 Aug 2011 16:36:58 +0000

Closes #1878: NS_ERROR_MALFORMED_URI when accessing EBSCO via proxy (I think)


Diffstat:
M
chrome/content/zotero/xpcom/utilities.js
 | 
11
++++++-----

1 file changed, 6 insertions(+), 5 deletions(-)
diff --git a/chrome/content/zotero/xpcom/utilities.js b/chrome/content/zotero/xpcom/utilities.js
@@ -1445,13 +1445,14 @@ Zotero.Utilities.Translate.prototype._convertURL = function(url) {
 	const protocolRe = /^(?:(?:http|https|ftp):)/i;
 	
 	// convert proxy to proper if applicable
-	if(this._translate.translator && this._translate.translator[0]
-			&& this._translate.translator[0].properToProxy) {
-		url = this._translate.translator[0].properToProxy(url);
+	if(protocolRe.test(url)) {
+		if(this._translate.translator && this._translate.translator[0]
+				&& this._translate.translator[0].properToProxy) {
+			url = this._translate.translator[0].properToProxy(url);
+		}
+		return url;
 	}
 	
-	if(protocolRe.test(url)) return url;
-	
 	// resolve local URL
 	var resolved = "";
 	if(Zotero.isFx) {