aboutsummaryrefslogtreecommitdiffstats
path: root/util/pluginloader.lua
diff options
context:
space:
mode:
authorKim Alvefur <zash@zash.se>2014-03-09 23:48:32 +0100
committerKim Alvefur <zash@zash.se>2014-03-09 23:48:32 +0100
commit7ac11ee4c7a1f7a02e9876d1ab08669d12ec53b0 (patch)
treebfeb64317bdac3d8e975d00d1ab26d3b7e340ce2 /util/pluginloader.lua
parent8ef88f2406b11d8bfe1fdd22370ecf33b1bc136e (diff)
parent9ea9c5719a2275b3ae66378619cef64a392a1fec (diff)
downloadprosody-7ac11ee4c7a1f7a02e9876d1ab08669d12ec53b0.tar.gz
prosody-7ac11ee4c7a1f7a02e9876d1ab08669d12ec53b0.zip
Merge 0.10->trunk
Diffstat (limited to 'util/pluginloader.lua')
-rw-r--r--util/pluginloader.lua8
1 files changed, 4 insertions, 4 deletions
diff --git a/util/pluginloader.lua b/util/pluginloader.lua
index b894f527..b9b3e207 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);