diff options
| author | Kim Alvefur <zash@zash.se> | 2014-05-09 23:35:54 +0200 |
|---|---|---|
| committer | Kim Alvefur <zash@zash.se> | 2014-05-09 23:35:54 +0200 |
| commit | ccb5e87519070a995cfad8090f517d4273cbeec9 (patch) | |
| tree | b18cb027c5578a9efd74e0e4bea0b0d4401abdec /core/moduleapi.lua | |
| parent | eaeb3cfea49d3c4cdfebf7bdd281e5633765e31b (diff) | |
| parent | cb8d6cd008a01a8fc7427c9489a2366e17e88a62 (diff) | |
| download | prosody-ccb5e87519070a995cfad8090f517d4273cbeec9.tar.gz prosody-ccb5e87519070a995cfad8090f517d4273cbeec9.zip | |
Merge 0.10->trunk
Diffstat (limited to 'core/moduleapi.lua')
| -rw-r--r-- | core/moduleapi.lua | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/core/moduleapi.lua b/core/moduleapi.lua index 5a24f69c..30d28418 100644 --- a/core/moduleapi.lua +++ b/core/moduleapi.lua @@ -13,6 +13,7 @@ local set = require "util.set"; local logger = require "util.logger"; local pluginloader = require "util.pluginloader"; local timer = require "util.timer"; +local resolve_relative_path = require"util.paths".resolve_relative_path; local t_insert, t_remove, t_concat = table.insert, table.remove, table.concat; local error, setmetatable, type = error, setmetatable, type; @@ -380,7 +381,7 @@ function api:get_directory() end function api:load_resource(path, mode) - path = config.resolve_relative_path(self:get_directory(), path); + path = resolve_relative_path(self:get_directory(), path); return io.open(path, mode); end |