aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorWaqas Hussain <waqas20@gmail.com>2011-02-20 20:11:52 +0500
committerWaqas Hussain <waqas20@gmail.com>2011-02-20 20:11:52 +0500
commitf80ca4e6a8556e45571ca866c0efd06350e1f930 (patch)
tree45795d27f51bfae15333af184675230407715bb0
parente55a81dfae6b0033938e30cd466e203e1aaa895a (diff)
downloadprosody-f80ca4e6a8556e45571ca866c0efd06350e1f930.tar.gz
prosody-f80ca4e6a8556e45571ca866c0efd06350e1f930.zip
util.pluginloader: Remove unused support for custom loaders, to simplify further refactoring.
-rw-r--r--util/pluginloader.lua14
1 files changed, 5 insertions, 9 deletions
diff --git a/util/pluginloader.lua b/util/pluginloader.lua
index 9300b98a..3a4e8003 100644
--- a/util/pluginloader.lua
+++ b/util/pluginloader.lua
@@ -32,28 +32,24 @@ local function load_file(name)
return content, path;
end
-function load_resource(plugin, resource, loader)
+function load_resource(plugin, resource)
local path, name = plugin:match("([^/]*)/?(.*)");
if name == "" then
if not resource then
resource = "mod_"..plugin..".lua";
end
- loader = loader or load_file;
- local content, err = loader(plugin.."/"..resource);
- if not content then content, err = loader(resource); end
- -- TODO add support for packed plugins
+ local content, err = load_file(plugin.."/"..resource);
+ if not content then content, err = load_file(resource); end
return content, err;
else
if not resource then
resource = "mod_"..name..".lua";
end
- loader = loader or load_file;
- local content, err = loader(plugin.."/"..resource);
- if not content then content, err = loader(path.."/"..resource); end
- -- TODO add support for packed plugins
+ local content, err = load_file(plugin.."/"..resource);
+ if not content then content, err = load_file(path.."/"..resource); end
return content, err;
end