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

Fix ZFS purging when switching to WebDAV

Browse source
This commit is contained in:
Dan Stillman 2013-04-15 22:21:54 -04:00
parent bafad27311
commit 5442e2e8a8
2 changed files with 5 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
chrome/content/zotero/preferences/preferences_sync.js
View file

@ -72,7 +72,7 @@ Zotero_Preferences.Sync = {
} }
if (oldProtocol == 'zotero' && protocol == 'webdav') { if (oldProtocol == 'zotero' && protocol == 'webdav') {
var sql = "SELECT COUNT(*) FROM version WHERE schema='storage_zfs'"; var sql = "SELECT COUNT(*) FROM version WHERE schema LIKE 'storage_zfs%'";
if (Zotero.DB.valueQuery(sql)) { if (Zotero.DB.valueQuery(sql)) {
var ps = Components.classes["@mozilla.org/embedcomp/prompt-service;1"] var ps = Components.classes["@mozilla.org/embedcomp/prompt-service;1"]
.getService(Components.interfaces.nsIPromptService); .getService(Components.interfaces.nsIPromptService);

4
chrome/content/zotero/xpcom/storage/zfs.js
View file

@ -1043,6 +1043,10 @@ Zotero.Sync.Storage.ZFS = (function () {
*/ */
obj._purgeDeletedStorageFiles = function () { obj._purgeDeletedStorageFiles = function () {
return Q.fcall(function () { return Q.fcall(function () {
// Cache the credentials at the root
return self._cacheCredentials();
}.bind(this))
then(function () {
// If we don't have a user id we've never synced and don't need to bother // If we don't have a user id we've never synced and don't need to bother
if (!Zotero.userID) { if (!Zotero.userID) {
return false; return false;