mirrors/prosody
1
0
Fork 0
mirror of https://github.com/bjc/prosody.git synced 2025-04-04 21:57:45 +03:00
Code Issues Projects Releases Packages Wiki Activity Actions

Eliminate direct setfenv usage

Browse source
This commit is contained in:
Florian Zeitz 2012-06-08 05:04:38 +02:00
parent 217e6d011c
commit d49b9bc2ab
11 changed files with 52 additions and 54 deletions
Download patch file Download diff file Expand all files Collapse all files

5
util/pluginloader.lua
View file

@ -16,6 +16,7 @@ end
local io_open, os_time = io.open, os.time;
local loadstring, pairs = loadstring, pairs;
local envload = require "util.envload".envload;
module "pluginloader"
@ -48,11 +49,11 @@ function load_resource(plugin, resource)
return load_file(names);
end
function load_code(plugin, resource)
function load_code(plugin, resource, env)
local content, err = load_resource(plugin, resource);
if not content then return content, err; end
local path = err;
local f, err = loadstring(content, "@"..path);
local f, err = envload(content, "@"..path, env);
if not f then return f, err; end
return f, path;
end