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 | bd5f9b8cbfd168a21141607218446222ab9d8642 (patch) | |
tree | e78baabff21e9b6fefaeef4a709098ca30b35922 /core/configmanager.lua | |
parent | 9b89441dd008a8b3fda12d9217ff6f9ba240df9a (diff) | |
parent | a2055895d362fed58ff314820bb7fddd53e40436 (diff) | |
download | prosody-bd5f9b8cbfd168a21141607218446222ab9d8642.tar.gz prosody-bd5f9b8cbfd168a21141607218446222ab9d8642.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]; |