mirrors/zotero
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages 1 Wiki Activity Actions 1

Fix handling of MIME type mismatches

Browse source
This commit is contained in:
Simon Kornblith 2012-07-22 01:48:18 -04:00
parent c6da52f24b
commit 430e43a6b6
1 changed files with 18 additions and 16 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

34
chrome/content/zotero/xpcom/connector/translate_item.js
View file

@ -282,7 +282,7 @@ Zotero.Translate.ItemSaver.prototype = {
}
}
if(err) throw err;
if(err) Zotero.logError(err);
});
};
@ -360,21 +360,23 @@ Zotero.Translate.ItemSaver.prototype = {
}
}
attachment.mimeType = contentType;
attachment.linkMode = "imported_url";
switch(contentType.toLowerCase()) {
case "application/pdf":
attachment.filename = baseName+".pdf";
break;
case "text/html":
case "application/xhtml+xml":
attachment.filename = baseName+".html";
break;
default:
attachment.filename = baseName;
if(!err) {
attachment.mimeType = contentType;
attachment.linkMode = "imported_url";
switch(contentType.toLowerCase()) {
case "application/pdf":
attachment.filename = baseName+".pdf";
break;
case "text/html":
case "application/xhtml+xml":
attachment.filename = baseName+".html";
break;
default:
attachment.filename = baseName;
}
if(charset) attachment.charset = charset;
headersValidated = true;
}
if(charset) attachment.charset = charset;
headersValidated = true;
}
// If we didn't validate the headers, cancel the request
@ -392,7 +394,7 @@ Zotero.Translate.ItemSaver.prototype = {
// If there was an error, throw it now
if(err) {
attachmentCallback(attachment, false, err);
throw err;
Zotero.logError(err);
}
};