diff options
| author | Kim Alvefur <zash@zash.se> | 2019-11-23 23:12:01 +0100 |
|---|---|---|
| committer | Kim Alvefur <zash@zash.se> | 2019-11-23 23:12:01 +0100 |
| commit | 72f1544f6d7301d1313c333f1147b27e242063df (patch) | |
| tree | 1a5b57117c8c88f05ebb8b67a0d2848988b7620c /util/pluginloader.lua | |
| parent | 7ac5e467baa7ebc557ed3a07bdca7dc9ade0c1db (diff) | |
| parent | dfa2bdffc083faa597509d7f35125c41f6ffbc9d (diff) | |
| download | prosody-72f1544f6d7301d1313c333f1147b27e242063df.tar.gz prosody-72f1544f6d7301d1313c333f1147b27e242063df.zip | |
Merge 0.11->trunk
Diffstat (limited to 'util/pluginloader.lua')
| -rw-r--r-- | util/pluginloader.lua | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/util/pluginloader.lua b/util/pluginloader.lua index 9ab8f245..af0428c4 100644 --- a/util/pluginloader.lua +++ b/util/pluginloader.lua @@ -36,12 +36,13 @@ end local function load_resource(plugin, resource) resource = resource or "mod_"..plugin..".lua"; - + local lua_version = _VERSION:match(" (.+)$"); local names = { "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 + "share"..dir_sep.."lua"..dir_sep..lua_version..dir_sep.."mod_"..plugin..dir_sep..resource; }; return load_file(names); |