Nemcio/NodeBB
1
0
Fork 0
mirror of https://github.com/NodeBB/NodeBB.git synced 2026-08-26 19:07:17 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/master' into develop

Browse Source
This commit is contained in:
Julian Lam
2017-12-28 16:26:35 -05:00
parent f2c251e89c cadea35cff
commit 8588a54ff2
20 changed files with 188 additions and 183 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/socket.io/user/ban.js
View File

@@ -1,6 +1,7 @@
'use strict';
var async = require('async');
var winston = require('winston');
var user = require('../../user');
var meta = require('../../meta');
@@ -112,7 +113,12 @@ module.exports = function (SocketUser) {
reason: reason,
};
emailer.send('banned', uid, data, next);
emailer.send('banned', uid, data, function (err) {
if (err) {
winston.error('[emailer.send] ' + err.message);
}
next();
});
},
function (next) {
user.ban(uid, until, reason, next);

2
src/upgrade.js
View File

@@ -205,7 +205,7 @@ Upgrade.incrementProgress = function (value) {
if (this.total) {
percentage = Math.floor((this.current / this.total) * 100) + '%';
filled = Math.floor((this.current / this.total) * 15);
unfilled = Math.min(0, 15 - filled);
unfilled = Math.max(0, 15 - filled);
}
readline.cursorTo(process.stdout, 0);

2
src/widgets/index.js
View File

@@ -31,7 +31,7 @@ widgets.render = function (uid, options, callback) {
var returnData = {};
async.each(locations, function (location, done) {
widgetsByLocation[location] = (data.global[location] || []).concat(data[options.template][location] || []);
widgetsByLocation[location] = (data[options.template][location] || []).concat(data.global[location] || []);
if (!widgetsByLocation[location].length) {
return done(null, { location: location, widgets: [] });