libre-service.eu/pad.libre-service.eu-etherpad
libre-service.eu/pad.libre-service.eu-etherpad
1
0
Fork 0
mirror of https://github.com/ether/etherpad-lite.git synced 2025-02-01 03:12:42 +01:00
Code Issues Projects Releases Wiki Activity

Merge pull request #2184 from qknight/patch-1

Browse source 
added /abs/path/settings.json handling
This commit is contained in:
John McLear 2014-08-23 21:24:46 +01:00
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

5
src/node/utils/Settings.js
View file

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