diff options
| author | Matthew Wild <mwild1@gmail.com> | 2012-04-24 21:59:20 +0100 |
|---|---|---|
| committer | Matthew Wild <mwild1@gmail.com> | 2012-04-24 21:59:20 +0100 |
| commit | 8f062c3d98b1e3c6a5b56cdb5ad4ea0a326a513d (patch) | |
| tree | fe8c013599dd847f7365cb1adab80ab8fe846de5 /core/configmanager.lua | |
| parent | fc3a3c0b0c3a37017bc500e58b8dbdd4b39627c9 (diff) | |
| parent | b23e6a2ef012c2d2568766ef0f41aaadf3cac826 (diff) | |
| download | prosody-8f062c3d98b1e3c6a5b56cdb5ad4ea0a326a513d.tar.gz prosody-8f062c3d98b1e3c6a5b56cdb5ad4ea0a326a513d.zip | |
Merge timber->trunk - thanks everyone!
Diffstat (limited to 'core/configmanager.lua')
| -rw-r--r-- | core/configmanager.lua | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/core/configmanager.lua b/core/configmanager.lua index 85919492..e2253171 100644 --- a/core/configmanager.lua +++ b/core/configmanager.lua @@ -41,6 +41,9 @@ function getconfig() end function get(host, section, key) + if not key then + section, key = "core", section; + end local sec = config[host][section]; if sec then return sec[key]; |