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

- Fix sync error with empty WebDAV URL

Browse source 
- Fix Verify Server hang with empty WebDAV URL
This commit is contained in:
Dan Stillman 2009-09-15 08:57:20 +00:00
parent e828ea6fa6
commit abf53e07ce
2 changed files with 8 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

10
chrome/content/zotero/xpcom/storage.js
View file

@ -79,7 +79,9 @@ Zotero.Sync.Storage = new function () {
return; return;
} }
if (!_session.initFromPrefs()) { if (!_session.initFromPrefs()) {
_error("Module not initialized"); Zotero.debug(_session.name + " module not initialized");
_callbacks.onSkip();
return;
} }
if (!_session.active) { if (!_session.active) {
@ -639,10 +641,8 @@ Zotero.Sync.Storage = new function () {
this.checkServer = function (module, callback) { this.checkServer = function (module, callback) {
_session = new Zotero.Sync.Storage.Session(module, { onError: _error }); _session = new Zotero.Sync.Storage.Session(module, { onError: callback });
if (!_session.initFromPrefs()) { _session.initFromPrefs();
_error("Module not initialized");
}
_session.checkServer(callback); _session.checkServer(callback);
} }

3
chrome/content/zotero/xpcom/storage/webdav.js
View file

@ -163,6 +163,9 @@ Zotero.Sync.Storage.Session.WebDAV.prototype.initFromPrefs = function () {
} }
var url = Zotero.Prefs.get('sync.storage.url'); var url = Zotero.Prefs.get('sync.storage.url');
if (!url) {
return false;
}
url = scheme + '://' + url; url = scheme + '://' + url;
var dir = "zotero"; var dir = "zotero";