diff options
author | Matthew Wild <mwild1@gmail.com> | 2009-06-23 15:58:56 +0100 |
---|---|---|
committer | Matthew Wild <mwild1@gmail.com> | 2009-06-23 15:58:56 +0100 |
commit | f00a5d70b30b132b763b2e20c68accb8ce52789d (patch) | |
tree | 0741204836fedee0caea15f4607bd996d7e5fdab /util/pluginloader.lua | |
parent | 3f141a44c2b4564e5d88748f76f53f5fec6c1a33 (diff) | |
parent | 54bbd9c98aa6e40463982ec2a92fa9a444704b43 (diff) | |
download | prosody-f00a5d70b30b132b763b2e20c68accb8ce52789d.tar.gz prosody-f00a5d70b30b132b763b2e20c68accb8ce52789d.zip |
Automated merge with http://waqas.ath.cx:8000/
Diffstat (limited to 'util/pluginloader.lua')
-rw-r--r-- | util/pluginloader.lua | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/util/pluginloader.lua b/util/pluginloader.lua index 1bf22f62..86075c90 100644 --- a/util/pluginloader.lua +++ b/util/pluginloader.lua @@ -27,7 +27,7 @@ end function load_code(plugin, resource) local content, err = load_resource(plugin, resource); if not content then return content, err; end - return loadstring(content, err), err; + return loadstring(content, err); end return _M; |