fuwafuwa
/
etherpad-lite
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge pull request #2184 from qknight/patch-1 

added /abs/path/settings.json handling
This commit is contained in:
John McLear 2014-08-23 21:24:46 +01:00
parent e34a4ea4ee 63b89b693d
commit 4b7562de58
1 changed files with 6 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/node/utils/Settings.js
View File

@ -177,8 +177,13 @@ exports.abiwordAvailable = function()
exports.reloadSettings = function reloadSettings() {
// Discover where the settings file lives
var settingsFilename = argv.settings || "settings.json";
settingsFilename = path.resolve(path.join(exports.root, settingsFilename));
if (path.resolve(settingsFilename)===settingsFilename) {
settingsFilename = path.resolve(settingsFilename);
} else {
settingsFilename = path.resolve(path.join(exports.root, settingsFilename));
}
var settingsStr;
try{
//read the settings sync