diff options
| author | Matthew Wild <mwild1@gmail.com> | 2016-02-05 00:04:11 +0000 |
|---|---|---|
| committer | Matthew Wild <mwild1@gmail.com> | 2016-02-05 00:04:11 +0000 |
| commit | 62e7b282ea4f6e72990d839bf7f26307ccb3a61c (patch) | |
| tree | a3336425edbdcdc8ad540dc565daac709882207b /core/moduleapi.lua | |
| parent | 00594e00a27c5172e9e5484e671427910f05cdd4 (diff) | |
| parent | e2b370c6bf9d1495d9d180fb8713d3a5d774e0fd (diff) | |
| download | prosody-62e7b282ea4f6e72990d839bf7f26307ccb3a61c.tar.gz prosody-62e7b282ea4f6e72990d839bf7f26307ccb3a61c.zip | |
Merge 0.10->trunk
Diffstat (limited to 'core/moduleapi.lua')
| -rw-r--r-- | core/moduleapi.lua | 14 |
1 files changed, 14 insertions, 0 deletions
diff --git a/core/moduleapi.lua b/core/moduleapi.lua index bdf9959f..ff68a15c 100644 --- a/core/moduleapi.lua +++ b/core/moduleapi.lua @@ -303,6 +303,20 @@ function api:get_option_inherited_set(name, ...) return value; end +function api:get_option_path(name, default, parent) + if parent == nil then + parent = parent or self:get_directory(); + elseif prosody.paths[parent] then + parent = prosody.paths[parent]; + end + local value = self:get_option_string(name, default); + if value == nil then + return nil; + end + return resolve_relative_path(parent, value); +end + + function api:context(host) return setmetatable({host=host or "*"}, {__index=self,__newindex=self}); end |