Skip to content

Commit

Permalink
Show "More Information…" button on WebDAV SSL cert error
Browse files Browse the repository at this point in the history
(Though the button takes you to to
https://www.zotero.org/support/kb/ssl_certificate_error rather than
https://www.zotero.org/support/kb/incomplete_cert_chain, since the error
comes from Zotero.HTTP.)
  • Loading branch information
dstillman committed Feb 9, 2018
1 parent 84d8bb4 commit e9a3f9b
Showing 1 changed file with 15 additions and 8 deletions.
23 changes: 15 additions & 8 deletions chrome/content/zotero/xpcom/storage/webdav.js
Expand Up @@ -866,7 +866,7 @@ Zotero.Sync.Storage.Mode.WebDAV.prototype = {
break;

case "NONEXISTENT_FILE_NOT_MISSING":
var errorTitle = Zotero.getString('sync.storage.error.webdav.serverConfig.title');
errorTitle = Zotero.getString('sync.storage.error.webdav.serverConfig.title');
errorMsg = Zotero.getString('sync.storage.error.webdav.nonexistentFileNotMissing');
break;

Expand All @@ -877,18 +877,25 @@ Zotero.Sync.Storage.Mode.WebDAV.prototype = {
}
}

// TEMP
if (!errorMsg) {
errorMsg = err;
var e;
if (errorMsg) {
e = {
message: errorMsg,
// Prevent Report Errors button for known errors
dialogButtonText: null
};
Zotero.logError(errorMsg);
}
else {
e = err;
Zotero.logError(err);
}

Zotero.logError(errorMsg);

if (!skipSuccessMessage) {
if (!errorTitle) {
var errorTitle = Zotero.getString("general.error");
errorTitle = Zotero.getString("general.error");
}
promptService.alert(window, errorTitle, errorMsg);
Zotero.Utilities.Internal.errorPrompt(errorTitle, e);
}
return false;
}),
Expand Down

0 comments on commit e9a3f9b

Please sign in to comment.