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

Revert "moved meta up"

Browse Source 
This reverts commit 8c9feb85a4.
This commit is contained in:
Julian Lam
2014-06-30 14:55:23 -04:00
parent cda3f9376d
commit ffd2ddc3e7
1 changed files with 4 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/install.js
View File

@@ -5,7 +5,6 @@ var async = require('async'),
url = require('url'), url = require('url'),
path = require('path'), path = require('path'),
prompt = require('prompt'), prompt = require('prompt'),
meta = require('./meta'),
winston = require('winston'), winston = require('winston'),
nconf = require('nconf'), nconf = require('nconf'),
utils = require('../public/src/utils.js'), utils = require('../public/src/utils.js'),
@@ -234,7 +233,8 @@ function setupDatabase(server_conf, next) {
function setupDefaultConfigs(next) { function setupDefaultConfigs(next) {
winston.info('Populating database with default configs, if not already set...'); winston.info('Populating database with default configs, if not already set...');
var defaults = require(path.join(__dirname, '../', 'install/data/defaults.json')); var meta = require('./meta'),
defaults = require(path.join(__dirname, '../', 'install/data/defaults.json'));
async.each(defaults, function (configObj, next) { async.each(defaults, function (configObj, next) {
meta.configs.setOnEmpty(configObj.field, configObj.value, next); meta.configs.setOnEmpty(configObj.field, configObj.value, next);
@@ -250,6 +250,7 @@ function setupDefaultConfigs(next) {
} }
function setOnEmpty(key1, key2) { function setOnEmpty(key1, key2) {
var meta = require('./meta');
if (install.values[key1] && install.values[key2]) { if (install.values[key1] && install.values[key2]) {
meta.configs.setOnEmpty(key1, install.values[key1]); meta.configs.setOnEmpty(key1, install.values[key1]);
meta.configs.setOnEmpty(key2, install.values[key2]); meta.configs.setOnEmpty(key2, install.values[key2]);
@@ -257,6 +258,7 @@ function setOnEmpty(key1, key2) {
} }
function enableDefaultTheme(next) { function enableDefaultTheme(next) {
var meta = require('./meta');
winston.info('Enabling default theme: Lavender'); winston.info('Enabling default theme: Lavender');
meta.themes.set({ meta.themes.set({