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

Pass tests

Browse Source
This commit is contained in:
Peter Jaszkowiak
2017-01-02 23:03:34 -07:00
parent ec544518e8
commit 11f7cc4163
5 changed files with 8 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

BIN
public/logo.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 7.0 KiB

After

Width:  |  Height:  |  Size: 3.6 KiB

6
src/controllers/admin/themes.js
View File

@@ -7,9 +7,9 @@ var themesController = {};
themesController.get = function (req, res, next) { themesController.get = function (req, res, next) {
var themeDir = path.join(__dirname, '../../../node_modules/' + req.params.theme); var themeDir = path.join(__dirname, '../../../node_modules/' + req.params.theme);
file.exists(themeDir, function (exists) { file.exists(themeDir, function (err, exists) {
if (!exists) { if (err || !exists) {
return next(); return next(err);
} }
var themeConfig = require(path.join(themeDir, 'theme.json')), var themeConfig = require(path.join(themeDir, 'theme.json')),

4
src/plugins.js
View File

@@ -352,9 +352,7 @@ var middleware;
} }
callback(null, stats.isDirectory()); callback(null, stats.isDirectory());
}); });
}, function (plugins) { }, next);
next(null, plugins);
});
}, },
function (files, next) { function (files, next) {

4
src/plugins/load.js
View File

@@ -160,13 +160,13 @@ module.exports = function (Plugins) {
var realPath = pluginData.staticDirs[mappedPath]; var realPath = pluginData.staticDirs[mappedPath];
var staticDir = path.join(pluginPath, realPath); var staticDir = path.join(pluginPath, realPath);
file.exists(staticDir, function (exists) { file.exists(staticDir, function (err, exists) {
if (exists) { if (exists) {
Plugins.staticDirs[pluginData.id + '/' + mappedPath] = staticDir; Plugins.staticDirs[pluginData.id + '/' + mappedPath] = staticDir;
} else { } else {
winston.warn('[plugins/' + pluginData.id + '] Mapped path \'' + mappedPath + ' => ' + staticDir + '\' not found.'); winston.warn('[plugins/' + pluginData.id + '] Mapped path \'' + mappedPath + ' => ' + staticDir + '\' not found.');
} }
callback(); callback(err);
}); });
} }
} }

4
src/webserver.js
View File

@@ -262,11 +262,11 @@ module.exports.testSocket = function (socketPath, callback) {
var file = require('./file'); var file = require('./file');
async.series([ async.series([
function (next) { function (next) {
file.exists(socketPath, function (exists) { file.exists(socketPath, function (err, exists) {
if (exists) { if (exists) {
next(); next();
} else { } else {
callback(); callback(err);
} }
}); });
}, },