aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMatthew Wild <mwild1@gmail.com>2010-11-13 04:12:49 +0000
committerMatthew Wild <mwild1@gmail.com>2010-11-13 04:12:49 +0000
commit60f1317b8728e8ea8c367f9f344216fb6cf0a948 (patch)
tree19c4219d23df4908a601eda7d58b72d879712278
parent79e901ace54c31d646e5056a60ae57970f13f7f3 (diff)
parenta3aa9ad46c87d13909283827d07786b5b14c84c1 (diff)
downloadprosody-60f1317b8728e8ea8c367f9f344216fb6cf0a948.tar.gz
prosody-60f1317b8728e8ea8c367f9f344216fb6cf0a948.zip
Merge backout
-rw-r--r--core/modulemanager.lua1
1 files changed, 0 insertions, 1 deletions
diff --git a/core/modulemanager.lua b/core/modulemanager.lua
index c78c315b..49ad12ac 100644
--- a/core/modulemanager.lua
+++ b/core/modulemanager.lua
@@ -117,7 +117,6 @@ function load(host, module_name, config)
local pluginenv = setmetatable({ module = api_instance }, { __index = _G });
api_instance.environment = pluginenv;
- pluginenv._M = pluginenv;
setfenv(mod, pluginenv);
hosts[host].modules = modulemap[host];