From a2b6df1014b130ff9d821ce4ecd97ee9c6194b0b Mon Sep 17 00:00:00 2001 From: Dan Stillman Date: Wed, 15 Apr 2015 16:03:47 -0400 Subject: [PATCH] Include both DB version numbers in "newer than SQL file" dialog --- chrome/content/zotero/xpcom/zotero.js | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/chrome/content/zotero/xpcom/zotero.js b/chrome/content/zotero/xpcom/zotero.js index 46014c27a..94a4bc804 100644 --- a/chrome/content/zotero/xpcom/zotero.js +++ b/chrome/content/zotero/xpcom/zotero.js @@ -610,12 +610,12 @@ Components.utils.import("resource://gre/modules/Services.jsm"); } catch (e) { if (e.toString().match('newer than SQL file')) { - let versions = e.toString().match(/\((\d+) < \d+\)/); + let versions = e.toString().match(/\((\d+) < (\d+)\)/); let kbURL = "https://www.zotero.org/support/kb/newer_db_version"; let msg = Zotero.getString('startupError.zoteroVersionIsOlder') + " " + Zotero.getString('startupError.zoteroVersionIsOlder.upgrade') + "\n\n" - + Zotero.getString('startupError.zoteroVersionIsOlder.current', Zotero.version) + "\n" - + (versions ? "DB: " + versions[1] + "\n\n" : "\n") + + Zotero.getString('startupError.zoteroVersionIsOlder.current', Zotero.version) + + (versions ? " (" + versions[1] + " < " + versions[2] + ")" : "") + "\n\n" + Zotero.getString('general.seeForMoreInformation', kbURL); Zotero.startupError = msg; _startupErrorHandler = function() {