aboutsummaryrefslogtreecommitdiffstats
path: root/util
diff options
context:
space:
mode:
authorWaqas Hussain <waqas20@gmail.com>2011-02-20 20:01:05 +0500
committerWaqas Hussain <waqas20@gmail.com>2011-02-20 20:01:05 +0500
commitcf8bb7899878272d41da09a9614a72531044369d (patch)
treef069695028bd463c10469afc64e8918dc520e2e6 /util
parentb4ea2bdb35d10c2a925c2b4662e51f9e77f8598a (diff)
downloadprosody-cf8bb7899878272d41da09a9614a72531044369d.tar.gz
prosody-cf8bb7899878272d41da09a9614a72531044369d.zip
util.pluginloader: Return full file path from internal file loader on success, not just the name.
Diffstat (limited to 'util')
-rw-r--r--util/pluginloader.lua7
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)