diff options
| author | Matthew Wild <mwild1@gmail.com> | 2020-09-30 09:50:33 +0100 |
|---|---|---|
| committer | Matthew Wild <mwild1@gmail.com> | 2020-09-30 09:50:33 +0100 |
| commit | 785c20f6ee7e61a5a91a8b6259623bc2a2bbffaa (patch) | |
| tree | 3a37db7b805b1555d08cc61c7938cf512ff35ce0 /util/pluginloader.lua | |
| parent | e55d037cdf89efac99c6144b381c9fa880f7fb93 (diff) | |
| parent | b80ff2ae4f86aa26e055890a8284b55170ef2056 (diff) | |
| download | prosody-785c20f6ee7e61a5a91a8b6259623bc2a2bbffaa.tar.gz prosody-785c20f6ee7e61a5a91a8b6259623bc2a2bbffaa.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); |