diff options
| author | Kim Alvefur <zash@zash.se> | 2014-03-09 23:48:32 +0100 |
|---|---|---|
| committer | Kim Alvefur <zash@zash.se> | 2014-03-09 23:48:32 +0100 |
| commit | f74e377a23600b3284f2cc9c4676c9836bae9d89 (patch) | |
| tree | bfeb64317bdac3d8e975d00d1ab26d3b7e340ce2 /util | |
| parent | b438e60d17b5103114ff9e187d171960d88259c9 (diff) | |
| parent | 9833b51da4e36251d94290577b504c9f8140d64d (diff) | |
| download | prosody-f74e377a23600b3284f2cc9c4676c9836bae9d89.tar.gz prosody-f74e377a23600b3284f2cc9c4676c9836bae9d89.zip | |
Merge 0.10->trunk
Diffstat (limited to 'util')
| -rw-r--r-- | util/pluginloader.lua | 8 |
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); |