Nemcio/NodeBB
1
0
Fork 0
mirror of https://github.com/NodeBB/NodeBB.git synced 2025-11-01 03:26:04 +01:00
Code Issues Packages Projects Releases Wiki Activity

Fix unhandled callback errors

Browse Source
This commit is contained in:
Mathias Schreck
2016-09-05 11:52:35 +02:00
parent 824c6d9362
commit fef9ec7ad6
2 changed files with 7 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
public/src/admin/settings/email.js
View File

@@ -79,6 +79,10 @@ define('admin/settings/email', ['admin/settings'], function(settings) {
} }
socket.emit('meta.getServerTime', {}, function(err, now) { socket.emit('meta.getServerTime', {}, function(err, now) {
if (err) {
return app.alertError(err.message);
}
now = new Date(now); now = new Date(now);
$('#serverTime').text(now.toString()); $('#serverTime').text(now.toString());

4
src/controllers/authentication.js
View File

@@ -381,7 +381,9 @@ authenticationController.localLogin = function(req, username, password, next) {
if (result.banned) { if (result.banned) {
// Retrieve ban reason and show error // Retrieve ban reason and show error
return user.getLatestBanInfo(uid, function(err, banInfo) { return user.getLatestBanInfo(uid, function(err, banInfo) {
if (banInfo.reason) { if (err) {
next(err);
} else if (banInfo.reason) {
next(new Error('[[error:user-banned-reason, ' + banInfo.reason + ']]')); next(new Error('[[error:user-banned-reason, ' + banInfo.reason + ']]'));
} else { } else {
next(new Error('[[error:user-banned]]')); next(new Error('[[error:user-banned]]'));