aboutsummaryrefslogtreecommitdiffstats
path: root/prosody
diff options
context:
space:
mode:
Diffstat (limited to 'prosody')
-rwxr-xr-xprosody4
1 files changed, 2 insertions, 2 deletions
diff --git a/prosody b/prosody
index 6ec9131e..3be2e53a 100755
--- a/prosody
+++ b/prosody
@@ -165,7 +165,7 @@ function init_global_state()
local path_sep = package.config:sub(1,1);
local rel_path_start = ".."..path_sep;
- function prosody.resolve_relative_path(path)
+ function prosody.resolve_relative_path(parent_path, path)
if path then
local is_relative;
if path_sep == "/" and path:sub(1,1) ~= "/" then
@@ -174,7 +174,7 @@ function init_global_state()
is_relative = true;
end
if is_relative then
- return CFG_CONFIGDIR..path_sep..path;
+ return parent_path..path_sep..path;
end
end
return path;