From 34e3926349a4339727bdebb0477e66849a57ea4f Mon Sep 17 00:00:00 2001
From: shagu <ericmauser@googlemail.com>
Date: Sun, 2 Jul 2017 22:54:05 +0200
Subject: [PATCH] api: make pfUI env available in globalspace

---
 api/api.lua |  2 +-
 pfUI.lua    | 15 ++++++++-------
 2 files changed, 9 insertions(+), 8 deletions(-)

diff --git a/api/api.lua b/api/api.lua
index 76813016..2f438d24 100644
--- a/api/api.lua
+++ b/api/api.lua
@@ -1,6 +1,6 @@
 pfUI.api = { }
-pfUI.api._G = getfenv(0)
 local _G = getfenv(0)
+local T, C, L = pfUI.env.T, pfUI.env.C, pfUI.env.L
 
 -- [ strsplit ]
 -- Splits a string using a delimiter.
diff --git a/pfUI.lua b/pfUI.lua
index 6034cd38..a9eb73de 100644
--- a/pfUI.lua
+++ b/pfUI.lua
@@ -41,6 +41,7 @@ pfUI.environment = {}
 pfUI.movables = {}
 pfUI.version = {}
 pfUI.hooks = {}
+pfUI.env = {}
 
 pfUI_playerDB = {}
 pfUI_config = {}
@@ -78,17 +79,17 @@ pfUI:SetScript("OnEvent", function()
     pfUI.environment:UpdateColors()
 
     -- unify module environment
-    local env_pfui = {}
-    setmetatable(env_pfui, {__index = getfenv(0)})
+    setmetatable(pfUI.env, {__index = getfenv(0)})
 
     -- load api into environment
     for m, func in pairs(pfUI.api) do
-      env_pfui[m] = func
+      pfUI.env[m] = func
     end
 
-    env_pfui.C = pfUI_config
-    env_pfui.L = pfUI_locale[GetLocale()] or pfUI_locale["enUS"]
-    env_pfui.T = setmetatable(pfUI_translation[GetLocale()] or {}, { __index = function(tab,key)
+    pfUI.env._G = getfenv(0)
+    pfUI.env.C = pfUI_config
+    pfUI.env.L = pfUI_locale[GetLocale()] or pfUI_locale["enUS"]
+    pfUI.env.T = setmetatable(pfUI_translation[GetLocale()] or {}, { __index = function(tab,key)
       local value = tostring(key)
       rawset(tab,key,value)
       return value
@@ -99,7 +100,7 @@ pfUI:SetScript("OnEvent", function()
       if pfUI_config["disabled"] and pfUI_config["disabled"][m]  == "1" then
         -- message("DEBUG: module " .. m .. " has been disabled")
       else
-        setfenv(pfUI.module[m], env_pfui)
+        setfenv(pfUI.module[m], pfUI.env)
         pfUI.module[m]()
       end
     end