mirror of
https://github.com/ether/etherpad-lite.git
synced 2025-05-10 08:55:00 -04:00
Merge b0099a4aba
into 0fa25264bc
This commit is contained in:
commit
2e865a2859
1 changed files with 2 additions and 1 deletions
|
@ -140,7 +140,8 @@ for(var i in settings)
|
||||||
}
|
}
|
||||||
|
|
||||||
//we know this setting, so we overwrite it
|
//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];
|
exports[i] = settings[i];
|
||||||
}
|
}
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue