mirrors/prosody
1
0
Fork 0
mirror of https://github.com/bjc/prosody.git synced 2025-04-04 21:57:45 +03:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge 0.10->trunk

Browse source
This commit is contained in:
Matthew Wild 2016-02-01 21:28:07 +00:00
commit 11dcbc505b
3 changed files with 23 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

5
core/moduleapi.lua
View file

@ -137,10 +137,7 @@ function api:wrap_global(event, handler)
end
function api:require(lib)
local f, n = pluginloader.load_code(self.name, lib..".lib.lua", self.environment);
if not f then
f, n = pluginloader.load_code(lib, lib..".lib.lua", self.environment);
end
local f, n = pluginloader.load_code_ext(self.name, lib, "lib.lua", self.environment);
if not f then error("Failed to load plugin library '"..lib.."', error: "..n); end -- FIXME better error message
return f();
end