Nemcio/NodeBB
1
0
Fork 0
mirror of https://github.com/NodeBB/NodeBB.git synced 2026-06-24 22:01:59 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/master' into v0.8.x

Browse Source
This commit is contained in:
Julian Lam
2015-08-27 16:20:25 -04:00
parent f11446e0bc 4b91d7ec3d
commit 141999a97c
2 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/meta/dependencies.js
View File

@@ -26,20 +26,20 @@ module.exports = function(Meta) {
}
try {
var pkgData = JSON.parse(pkgData),
ok = !semver.validRange(pkg.dependencies[module]) || semver.satisfies(pkgData.version, pkg.dependencies[module]);
pkgData = JSON.parse(pkgData);
var ok = !semver.validRange(pkg.dependencies[module]) || semver.satisfies(pkgData.version, pkg.dependencies[module]);
if (ok || (pkgData._resolved && pkgData._resolved.indexOf('//github.com') !== -1)) {
next(true);
} else {
process.stdout.write('[' + 'outdated'.yellow + '] ' + module.bold + ' installed v' + pkgData.version + ', package.json requires ' + pkg.dependencies[module] + '\n')
process.stdout.write('[' + 'outdated'.yellow + '] ' + module.bold + ' installed v' + pkgData.version + ', package.json requires ' + pkg.dependencies[module] + '\n');
next(false);
}
} catch(e) {
winston.error('[meta/dependencies] Could not read: ' + module);
process.exit();
}
})
});
}, function(ok) {
callback(!ok && global.env !== 'development' ? new Error('dependencies-out-of-date') : null);
});

4
src/middleware/middleware.js
View File

@@ -300,7 +300,7 @@ middleware.renderHeader = function(req, res, data, callback) {
templateValues.template = {name: res.locals.template};
templateValues.template[res.locals.template] = true;
if (req.route.path === '/') {
if (req.route && req.route.path === '/') {
modifyTitle(templateValues);
}
@@ -346,7 +346,7 @@ middleware.processRender = function(req, res, next) {
}
if (res.locals.isAPI) {
if (req.route.path === '/api/') {
if (req.route && req.route.path === '/api/') {
options.title = '[[pages:home]]';
}