diff options
| author | Matthew Wild <mwild1@gmail.com> | 2016-02-01 21:28:07 +0000 |
|---|---|---|
| committer | Matthew Wild <mwild1@gmail.com> | 2016-02-01 21:28:07 +0000 |
| commit | 6cb4a340b97827f572c55b87b254352e20e38f4a (patch) | |
| tree | b1ba3e9f2c4c1b332f4b0264453b7b9c01952163 /core | |
| parent | 83d80d03ff08842f1d36a38136ad778ba9ff3a25 (diff) | |
| parent | d0c5e1571fcd0d0242815c1076d56ecf917eec13 (diff) | |
| download | prosody-6cb4a340b97827f572c55b87b254352e20e38f4a.tar.gz prosody-6cb4a340b97827f572c55b87b254352e20e38f4a.zip | |
Merge 0.10->trunk
Diffstat (limited to 'core')
| -rw-r--r-- | core/moduleapi.lua | 5 |
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 |