Nemcio/NodeBB
1
0
Fork 0
mirror of https://github.com/NodeBB/NodeBB.git synced 2025-11-02 20:16:04 +01:00
Code Issues Packages Projects Releases Wiki Activity

fixed merge conflict

Browse Source
This commit is contained in:
psychobunny
2014-02-27 15:11:50 -05:00
parent 96d6b96ce4 e2fb3dacca
commit 4435a20d90
130 changed files with 1453 additions and 1139 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
src/webserver.js
View File

@@ -53,7 +53,7 @@ var shutdown = function(code) {
db.close();
winston.info('[app] Database connection closed.');
winston.info('[app] Goodbye!');
winston.info('[app] Shutdown complete.');
process.exit();
},
restart = function() {
@@ -177,6 +177,11 @@ process.on('uncaughtException', function(err) {
// Meta Tags
/*templateValues.metaTags = defaultMetaTags.concat(options.metaTags || []).map(function(tag) {
if(!tag || typeof tag.content !== 'string') {
winston.warn('Invalid meta tag. ', tag);
return tag;
}
tag.content = tag.content.replace(/[&<>'"]/g, function(tag) {
return escapeList[tag] || tag;
});