www

commit 73a9eb27093f767d83204b8a99a99266fd4db475
parent 7780560c1b0316428a2d45b1efb241a6f958ef65
Author: Dan Stillman <dstillman@zotero.org>
Date:   Mon, 12 Aug 2013 03:51:48 -0400

Remove ancient DB_REBUILD config option

Diffstat:
M
chrome/content/zotero/xpcom/db.js
 | 
15
---------------
M
chrome/content/zotero/xpcom/zotero.js
 | 
1
-

2 files changed, 0 insertions(+), 16 deletions(-)
diff --git a/chrome/content/zotero/xpcom/db.js b/chrome/content/zotero/xpcom/db.js
@@ -1314,21 +1314,6 @@ Zotero.DBConnection.prototype._getDBConnection = function () {
 	
 	var fileName = this._dbName + '.sqlite';
 	
-	if (this._dbName == 'zotero' && ZOTERO_CONFIG['DB_REBUILD']) {
-		if (confirm('Erase all user data and recreate database from schema?')) {
-			// Delete existing Zotero database
-			if (file.exists()) {
-				file.remove(null);
-			}
-			
-			// Delete existing storage folder
-			var dir = Zotero.getStorageDirectory();
-			if (dir.exists()) {
-				dir.remove(true);
-			}
-		}
-	}
-	
 	catchBlock: try {
 		var corruptMarker = Zotero.getZoteroDatabase(this._dbName, 'is.corrupt');
 		if (corruptMarker.exists()) {
diff --git a/chrome/content/zotero/xpcom/zotero.js b/chrome/content/zotero/xpcom/zotero.js
@@ -25,7 +25,6 @@
 
 const ZOTERO_CONFIG = {
 	GUID: 'zotero@chnm.gmu.edu',
-	DB_REBUILD: false, // erase DB and recreate from schema
 	REPOSITORY_URL: 'https://repo.zotero.org/repo',
 	REPOSITORY_CHECK_INTERVAL: 86400, // 24 hours
 	REPOSITORY_RETRY_INTERVAL: 3600, // 1 hour