aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorKim Alvefur <zash@zash.se>2014-03-09 22:15:40 +0100
committerKim Alvefur <zash@zash.se>2014-03-09 22:15:40 +0100
commit2bc53749ad1bec6f3677791312ed2328b91a1473 (patch)
tree0f9eb51b14dc431cfa094ba991508ac084939c4a
parent9ff00bc6169d7d64d4cea491c1b225ff0e3efa8a (diff)
downloadprosody-2bc53749ad1bec6f3677791312ed2328b91a1473.tar.gz
prosody-2bc53749ad1bec6f3677791312ed2328b91a1473.zip
util.pluginloader: Always use path separator from package.config (thanks Junne)
-rw-r--r--util/pluginloader.lua8
1 files changed, 4 insertions, 4 deletions
diff --git a/util/pluginloader.lua b/util/pluginloader.lua
index c10fdf65..112c0d52 100644
--- a/util/pluginloader.lua
+++ b/util/pluginloader.lua
@@ -39,10 +39,10 @@ function load_resource(plugin, resource)
resource = resource or "mod_"..plugin..".lua";
local names = {
- "mod_"..plugin.."/"..plugin.."/"..resource; -- mod_hello/hello/mod_hello.lua
- "mod_"..plugin.."/"..resource; -- mod_hello/mod_hello.lua
- plugin.."/"..resource; -- hello/mod_hello.lua
- resource; -- mod_hello.lua
+ "mod_"..plugin..dir_sep..plugin..dir_sep..resource; -- mod_hello/hello/mod_hello.lua
+ "mod_"..plugin..dir_sep..resource; -- mod_hello/mod_hello.lua
+ plugin..dir_sep..resource; -- hello/mod_hello.lua
+ resource; -- mod_hello.lua
};
return load_file(names);