X-Git-Url: https://git.enpas.org/?a=blobdiff_plain;f=core%2Fconfigmanager.lua;h=1fbe83b8258aa127cd3afed0f22ae5f8dea220fb;hb=571db8df18df0f966d2416546e7baaf5e33e8531;hp=77cfd575548e794a88432a6636d4fc7d79b4b9a9;hpb=30696ec27c14adff868260e53f21fa6ded96d6e8;p=prosody.git

diff --git a/core/configmanager.lua b/core/configmanager.lua
index 77cfd575..1fbe83b8 100644
--- a/core/configmanager.lua
+++ b/core/configmanager.lua
@@ -1,4 +1,4 @@
--- Prosody IM v0.4
+-- Prosody IM
 -- Copyright (C) 2008-2009 Matthew Wild
 -- Copyright (C) 2008-2009 Waqas Hussain
 -- 
@@ -68,7 +68,7 @@ function load(filename, format)
 	if parsers[format] and parsers[format].load then
 		local f, err = io.open(filename);
 		if f then 
-			local ok, err = parsers[format].load(f:read("*a"));
+			local ok, err = parsers[format].load(f:read("*a"), filename);
 			f:close();
 			if ok then
 				eventmanager.fire_event("config-reloaded", { filename = filename, format = format });
@@ -99,7 +99,7 @@ do
 	local loadstring, pcall, setmetatable = _G.loadstring, _G.pcall, _G.setmetatable;
 	local setfenv, rawget, tostring = _G.setfenv, _G.rawget, _G.tostring;
 	parsers.lua = {};
-	function parsers.lua.load(data)
+	function parsers.lua.load(data, filename)
 		local env;
 		-- The ' = true' are needed so as not to set off __newindex when we assign the functions below
 		env = setmetatable({ Host = true; host = true; Component = true, component = true,
@@ -113,6 +113,7 @@ do
 											set(env.__currenthost or "*", "core", k, v);
 										end});
 		
+		rawset(env, "__currenthost", "*") -- Default is global
 		function env.Host(name)
 			rawset(env, "__currenthost", name);
 			-- Needs at least one setting to logically exist :)
@@ -138,7 +139,7 @@ do
 			local f, err = io.open(file);
 			if f then
 				local data = f:read("*a");
-				local ok, err = parsers.lua.load(data);
+				local ok, err = parsers.lua.load(data, file);
 				if not ok then error(err:gsub("%[string.-%]", file), 0); end
 			end
 			if not f then error("Error loading included "..file..": "..err, 0); end
@@ -146,7 +147,7 @@ do
 		end
 		env.include = env.Include;
 		
-		local chunk, err = loadstring(data);
+		local chunk, err = loadstring(data, "@"..filename);
 		
 		if not chunk then
 			return nil, err;