aboutsummaryrefslogtreecommitdiffstats
path: root/core
diff options
context:
space:
mode:
authorMatthew Wild <mwild1@gmail.com>2016-02-01 21:28:07 +0000
committerMatthew Wild <mwild1@gmail.com>2016-02-01 21:28:07 +0000
commit11dcbc505b599add9294e27addaa697aa97e1e0c (patch)
treeb1ba3e9f2c4c1b332f4b0264453b7b9c01952163 /core
parentbebb4e7b675a3db13263c1946c16b090bcf8f4f5 (diff)
parenta1e077c5e7d4f6d2768c47a6847fbe8eea0f28d8 (diff)
downloadprosody-11dcbc505b599add9294e27addaa697aa97e1e0c.tar.gz
prosody-11dcbc505b599add9294e27addaa697aa97e1e0c.zip
Merge 0.10->trunk
Diffstat (limited to 'core')
-rw-r--r--core/moduleapi.lua5
1 files changed, 1 insertions, 4 deletions
diff --git a/core/moduleapi.lua b/core/moduleapi.lua
index 114a97a7..bdf9959f 100644
--- a/core/moduleapi.lua
+++ b/core/moduleapi.lua
@@ -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