From 0c545d5f2ec8878ab9b82b5721704b3e3503ac8e Mon Sep 17 00:00:00 2001 From: Hannah Wolfe Date: Thu, 19 Sep 2013 08:51:01 +0100 Subject: [PATCH] Cleanup --- core/server/data/migration/index.js | 1 - core/server/models/settings.js | 1 - 2 files changed, 2 deletions(-) diff --git a/core/server/data/migration/index.js b/core/server/data/migration/index.js index fad4a9f86c3e..8b62da0dd1c4 100644 --- a/core/server/data/migration/index.js +++ b/core/server/data/migration/index.js @@ -34,7 +34,6 @@ function getDatabaseVersion() { // Check for the current version from the settings table if (exists) { // Temporary code to deal with old databases with currentVersion settings - // TODO: remove before release return knex('settings') .where('key', 'databaseVersion') .orWhere('key', 'currentVersion') diff --git a/core/server/models/settings.js b/core/server/models/settings.js index 6c55e2cc994d..ba6206a46d3e 100644 --- a/core/server/models/settings.js +++ b/core/server/models/settings.js @@ -109,7 +109,6 @@ Settings = GhostBookshelf.Model.extend({ _.each(defaultSettings, function (defaultSetting, defaultSettingKey) { var isMissingFromDB = usedKeys.indexOf(defaultSettingKey) === -1; // Temporary code to deal with old databases with currentVersion settings - // TODO: remove before release if (defaultSettingKey === 'databaseVersion' && usedKeys.indexOf('currentVersion') !== -1) { isMissingFromDB = false; }