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
commit8bc89fe8e53fa1e317c2700972b6df2de94ae31c (patch)
tree0f9eb51b14dc431cfa094ba991508ac084939c4a
parentd9ffe681cbf0d84523576d1cdab6dc1a39f4814f (diff)
downloadprosody-8bc89fe8e53fa1e317c2700972b6df2de94ae31c.tar.gz
prosody-8bc89fe8e53fa1e317c2700972b6df2de94ae31c.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);