mirror of
https://github.com/NodeBB/NodeBB.git
synced 2026-02-03 21:30:06 +01:00
Merge branch 'master' of https://github.com/stevelacy/NodeBB
This commit is contained in:
4
app.js
4
app.js
@@ -171,9 +171,9 @@ function start() {
|
||||
break;
|
||||
}
|
||||
});
|
||||
|
||||
|
||||
process.on('uncaughtException', function(err) {
|
||||
winston.error(err.message);
|
||||
winston.error(err.stack);
|
||||
console.log(err.stack);
|
||||
|
||||
meta.js.killMinifier();
|
||||
|
||||
@@ -62,6 +62,10 @@ var fs = require('fs'),
|
||||
events.logWithUser(uid, 'restored post (pid ' + pid + ')');
|
||||
};
|
||||
|
||||
events.logPostPurge = function(uid, pid) {
|
||||
events.logWithUser(uid, 'purged post (pid ' + pid + ')');
|
||||
};
|
||||
|
||||
events.logTopicMove = function(uid, tid) {
|
||||
events.logWithUser(uid, 'moved topic (tid ' + tid + ')');
|
||||
};
|
||||
|
||||
@@ -660,8 +660,8 @@ var fs = require('fs'),
|
||||
pluginMap[plugin.name].version = plugin.version;
|
||||
|
||||
getVersion(plugin.id, function(err, version) {
|
||||
pluginMap[plugin.name].latest = version;
|
||||
pluginMap[plugin.name].outdated = version !== pluginMap[plugin.name].version;
|
||||
pluginMap[plugin.name].latest = version || plugin.version;
|
||||
pluginMap[plugin.name].outdated = pluginMap[plugin.name].latest !== pluginMap[plugin.name].version;
|
||||
next();
|
||||
});
|
||||
}, function(err) {
|
||||
@@ -697,10 +697,10 @@ var fs = require('fs'),
|
||||
npm.load({}, function() {
|
||||
npm.commands.show([name, 'version'], true, function(err, version) {
|
||||
if (err || !version) {
|
||||
return callback(null, 'no version');
|
||||
return callback();
|
||||
}
|
||||
var obj = Object.keys(version);
|
||||
callback(null, Array.isArray(obj) && obj.length ? obj[0] : 'no version');
|
||||
callback(null, Array.isArray(obj) && obj.length ? obj[0] : null);
|
||||
});
|
||||
});
|
||||
}
|
||||
|
||||
@@ -166,7 +166,7 @@ var winston = require('winston'),
|
||||
if (err || !canEdit) {
|
||||
return callback(err || new Error('[[error:no-privileges]]'));
|
||||
}
|
||||
|
||||
events.logPostPurge(uid, pid);
|
||||
posts.purge(pid, callback);
|
||||
});
|
||||
};
|
||||
|
||||
Reference in New Issue
Block a user