Nemcio/NodeBB
1
0
Fork 0
mirror of https://github.com/NodeBB/NodeBB.git synced 2026-07-06 23:27:56 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' into assets-images-upgrade

Browse Source
This commit is contained in:
Barış Soner Uşaklı
2017-03-01 17:40:44 +02:00
committed by GitHub
parent b96b983552 ac84e447dc
commit 6222b55dd8
1 changed files with 8 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
src/upgrade.js
View File

@@ -321,7 +321,6 @@ Upgrade.upgrade = function (callback) {
updatesMade = true;
winston.verbose(schemaName);
var user = require('./user');
var meta = require('./meta');
var batch = require('./batch');
@@ -358,14 +357,18 @@ Upgrade.upgrade = function (callback) {
if (err || !settings) {
return next(err);
}
var newSettings = {};
keys.forEach(function (key) {
if (settings[key] && settings[key].indexOf(' | ') === -1) {
settings[key] = map[settings[key]] || '';
newSettings[key] = map[settings[key]] || '';
}
});
user.saveSettings(uid, settings, next);
if (Object.keys(newSettings).length) {
user.saveSettings(uid, settings, next);
} else {
setImmediate(next);
}
});
}, next);
}, cb);