mirror of
https://github.com/NodeBB/NodeBB.git
synced 2025-11-08 23:15:48 +01:00
some cleanup and fixing breaking bug introduced by merge
This commit is contained in:
6
app.js
6
app.js
@@ -82,8 +82,10 @@ fs.readFile(path.join(__dirname, 'config.json'), function(err, data) {
|
|||||||
|
|
||||||
process.stdout.write(
|
process.stdout.write(
|
||||||
"\nWelcome to NodeBB!\nThis looks like a new installation, so you'll have to answer a " +
|
"\nWelcome to NodeBB!\nThis looks like a new installation, so you'll have to answer a " +
|
||||||
"few questions about your environment before we can proceed with the setup.\n\n\nWhat is...\n\n"
|
"few questions about your environment before we can proceed with the setup.\n\n" +
|
||||||
);
|
"Press enter to accept the default setting (shown in brackets).\n\n\n" +
|
||||||
|
"What is...\n\n"
|
||||||
|
);
|
||||||
|
|
||||||
ask('... the publically accessible URL of this installation? (http://localhost)', function(base_url) {
|
ask('... the publically accessible URL of this installation? (http://localhost)', function(base_url) {
|
||||||
ask('... the port number of your install? (4567)', function(port) {
|
ask('... the port number of your install? (4567)', function(port) {
|
||||||
|
|||||||
@@ -2,10 +2,7 @@
|
|||||||
var RDB = require('./redis.js'),
|
var RDB = require('./redis.js'),
|
||||||
schema = require('./schema.js'),
|
schema = require('./schema.js'),
|
||||||
posts = require('./posts.js'),
|
posts = require('./posts.js'),
|
||||||
topics = require('./topics.js'),
|
topics = require('./topics.js');
|
||||||
config = require('../config.js');
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
function saveFeed(feed, xml) {
|
function saveFeed(feed, xml) {
|
||||||
feed.endEntry();
|
feed.endEntry();
|
||||||
@@ -16,7 +13,6 @@
|
|||||||
var ATOMWriter = require('atom-writer'),
|
var ATOMWriter = require('atom-writer'),
|
||||||
feed = new ATOMWriter(xml);
|
feed = new ATOMWriter(xml);
|
||||||
|
|
||||||
|
|
||||||
return feed
|
return feed
|
||||||
.startFeed(urn)
|
.startFeed(urn)
|
||||||
.writeStartIndex(1)
|
.writeStartIndex(1)
|
||||||
@@ -74,10 +70,7 @@
|
|||||||
|
|
||||||
};
|
};
|
||||||
|
|
||||||
|
|
||||||
Feed.updateCategory = function(params) {
|
Feed.updateCategory = function(params) {
|
||||||
|
|
||||||
};
|
};
|
||||||
|
|
||||||
|
|
||||||
}(exports));
|
}(exports));
|
||||||
Reference in New Issue
Block a user