mirrors/etherpad-lite
1
0
Fork 0
mirror of https://github.com/ether/etherpad-lite.git synced 2025-04-20 15:36:16 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions 27

fixed merge conflict

Browse source
This commit is contained in:
Peter 'Pita' Martischka 2012-01-22 15:23:50 +01:00
commit d391dab558
3 changed files with 17 additions and 12 deletions
Download patch file Download diff file Expand all files Collapse all files

4
node/utils/Settings.js
View file

@ -21,6 +21,7 @@
var fs = require("fs");
var os = require("os");
var path = require('path');
/**
* The IP ep-lite should listen to
@ -88,7 +89,8 @@ exports.abiwordAvailable = function()
}
//read the settings sync
var settingsStr = fs.readFileSync("../settings.json").toString();
var settingsPath = path.normalize(__dirname + "/../../");
var settingsStr = fs.readFileSync(settingsPath + "settings.json").toString();
//remove all comments
settingsStr = settingsStr.replace(/\*([^*]|[\r\n]|(\*+([^*/]|[\r\n])))*\*+/gm,"").replace(/#.*/g,"").replace(/\/\/.*/g,"");