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

Fix handling of app downgrade to lower global schema version

Browse source
This commit is contained in:
Dan Stillman 2019-10-28 05:36:44 -04:00
parent 7c8aed2a34
commit 6db1fbd13f
1 changed files with 3 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
chrome/content/zotero/xpcom/schema.js
View file

@ -325,11 +325,11 @@ Zotero.Schema = new function(){
var pako = {};
Services.scriptloader.loadSubScript("resource://zotero/pako.js", pako);
var data = await Zotero.DB.valueQueryAsync(
"SELECT value FROM settings WHERE schema='globalSchema' AND key='data'"
"SELECT value FROM settings WHERE setting='globalSchema' AND key='data'"
);
if (data) {
try {
data = JSON.parse(pako.inflate(data, { to: 'string' }));
return JSON.parse(pako.inflate(data, { to: 'string' }));
}
catch (e) {
Zotero.warn("Unable to extract global schema -- falling back to file: " + e);
@ -341,9 +341,7 @@ Zotero.Schema = new function(){
// If the data is missing or unreadable in the DB for some reason (e.g., DB corruption),
// fall back to the file, though it might be out of date
if (!data) {
data = await _readGlobalSchemaFromFile();
}
data = await _readGlobalSchemaFromFile();
return data;
}