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-01-19 14:13:34 +01:00
Code Issues Projects Releases Wiki Activity

Fix path.join in Settings.js

Browse source
This commit is contained in:
Marcel Klehr 2013-03-16 09:47:10 +01:00
parent 5a9393d5da
commit cd9c78998e
1 changed files with 1 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

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