diff options
author | Matthew Wild <mwild1@gmail.com> | 2012-04-29 02:10:55 +0100 |
---|---|---|
committer | Matthew Wild <mwild1@gmail.com> | 2012-04-29 02:10:55 +0100 |
commit | fe228888c0d51612e8b32adc3f9db91b7c6e8ded (patch) | |
tree | e78baabff21e9b6fefaeef4a709098ca30b35922 /core/configmanager.lua | |
parent | 9d04baca862bcad5b49ac4ab0b9c3432321150d3 (diff) | |
parent | 1ee9f6e09228b268bf3f5dc985d4ba9026a72666 (diff) | |
download | prosody-fe228888c0d51612e8b32adc3f9db91b7c6e8ded.tar.gz prosody-fe228888c0d51612e8b32adc3f9db91b7c6e8ded.zip |
Merge 0.9->trunk
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]; |