diff options
| author | Kim Alvefur <zash@zash.se> | 2013-03-23 04:17:39 +0100 |
|---|---|---|
| committer | Kim Alvefur <zash@zash.se> | 2013-03-23 04:17:39 +0100 |
| commit | 983891c9fa8e728aa4680aedc74ec50a0329346e (patch) | |
| tree | fc52870bbca26966e739b1654dd7ff728fbbd9e0 /core/moduleapi.lua | |
| parent | 4adcfb2d185bb95ec430822c772f091b713faa7a (diff) | |
| parent | 869da6c240dccfed8c43228ceb989af5faf6c8f1 (diff) | |
| download | prosody-983891c9fa8e728aa4680aedc74ec50a0329346e.tar.gz prosody-983891c9fa8e728aa4680aedc74ec50a0329346e.zip | |
Merge 0.9->trunk
Diffstat (limited to 'core/moduleapi.lua')
| -rw-r--r-- | core/moduleapi.lua | 7 |
1 files changed, 2 insertions, 5 deletions
diff --git a/core/moduleapi.lua b/core/moduleapi.lua index 20898fcf..f9701471 100644 --- a/core/moduleapi.lua +++ b/core/moduleapi.lua @@ -167,12 +167,9 @@ function api:shared(...) end function api:get_option(name, default_value) - local value = config.get(self.host, self.name, name); + local value = config.get(self.host, name); if value == nil then - value = config.get(self.host, "core", name); - if value == nil then - value = default_value; - end + value = default_value; end return value; end |