diff options
author | Waqas Hussain <waqas20@gmail.com> | 2011-02-20 20:01:05 +0500 |
---|---|---|
committer | Waqas Hussain <waqas20@gmail.com> | 2011-02-20 20:01:05 +0500 |
commit | e8e82713fe030d88912c6962e620de54121223de (patch) | |
tree | d1de75bea4c10670676b4733cdf59f101b211b70 /util/pluginloader.lua | |
parent | 78b3e4e756687dac5b747f4a4e9cf83091b9f9de (diff) | |
download | prosody-e8e82713fe030d88912c6962e620de54121223de.tar.gz prosody-e8e82713fe030d88912c6962e620de54121223de.zip |
util.pluginloader: Return full file path from internal file loader on success, not just the name.
Diffstat (limited to 'util/pluginloader.lua')
-rw-r--r-- | util/pluginloader.lua | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/util/pluginloader.lua b/util/pluginloader.lua index 1aedd630..d9553537 100644 --- a/util/pluginloader.lua +++ b/util/pluginloader.lua @@ -20,15 +20,16 @@ local loadstring, pairs = loadstring, pairs; module "pluginloader" local function load_file(name) - local file, err; + local file, err, path; for i=1,#plugin_dir do - file, err = io_open(plugin_dir[i]..name); + path = plugin_dir[i]..name; + file, err = io_open(path); if file then break; end end if not file then return file, err; end local content = file:read("*a"); file:close(); - return content, name; + return content, path; end function load_resource(plugin, resource, loader) |