mirrors/etherpad-lite
1
0
Fork 0
mirror of https://github.com/ether/etherpad-lite.git synced 2025-05-10 00:45:01 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

Merge b0099a4aba into 0fa25264bc

Browse source
This commit is contained in:
Marcel Klehr 2012-11-05 04:48:30 -08:00
commit 2e865a2859
1 changed files with 2 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -140,7 +140,8 @@ for(var i in settings)
}
//we know this setting, so we overwrite it
if(exports[i] !== undefined)
//or it's a settings hash, specific to a plugin
if(exports[i] !== undefined || i.indexOf('ep_')==0)
{
exports[i] = settings[i];
}