aboutsummaryrefslogtreecommitdiffstats
path: root/util
diff options
context:
space:
mode:
authorKim Alvefur <zash@zash.se>2014-03-09 23:47:53 +0100
committerKim Alvefur <zash@zash.se>2014-03-09 23:47:53 +0100
commit9ea9c5719a2275b3ae66378619cef64a392a1fec (patch)
treee200875dd171732b5fcd8da80a7b225b72c89491 /util
parent42c4183e34f2a15920d3df042eed5531b552c495 (diff)
parentf666a0d9340519bc839fa97f2f9d5e6e8cad9cdb (diff)
downloadprosody-9ea9c5719a2275b3ae66378619cef64a392a1fec.tar.gz
prosody-9ea9c5719a2275b3ae66378619cef64a392a1fec.zip
Merge 0.9->0.10
Diffstat (limited to 'util')
-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);