0.3->0.4

[prosody.git] / core / configmanager.lua

diff --git a/core/configmanager.lua b/core/configmanager.lua
index 63a9cf89c91d16aa0cd9eb7bb1a36e8bf015239b..f04c557541c1c943484fb2c1b5e199676d49c32c 100644 (file)
--- a/core/configmanager.lua
+++ b/core/configmanager.lua
@@ -1,4 +1,4 @@
--- Prosody IM v0.3
+-- Prosody IM v0.4
 -- Copyright (C) 2008-2009 Matthew Wild
 -- Copyright (C) 2008-2009 Waqas Hussain
 -- 
@@ -9,8 +9,8 @@
 
 
 local _G = _G;
-local  setmetatable, loadfile, pcall, rawget, rawset, io, error = 
-               setmetatable, loadfile, pcall, rawget, rawset, io, error;
+local  setmetatable, loadfile, pcall, rawget, rawset, io, error, dofile, type = 
+               setmetatable, loadfile, pcall, rawget, rawset, io, error, dofile, type;
 
 module "configmanager"
 
@@ -98,7 +98,7 @@ do
                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,
-                                                       Include = true, include = true }, { __index = function (t, k)
+                                                       Include = true, include = true, RunScript = dofile }, { __index = function (t, k)
                                                                                                return rawget(_G, k) or
                                                                                                                function (settings_table)
                                                                                                                        config[__currenthost or "*"][k] = settings_table;
@@ -117,10 +117,12 @@ do
                
                function env.Component(name)
                        return function (module)
-                                       set(name, "core", "component_module", module);
-                                       -- Don't load the global modules by default
-                                       set(name, "core", "modules_enable", false);
-                                       rawset(env, "__currenthost", name);
+                                       if type(module) == "string" then
+                                               set(name, "core", "component_module", module);
+                                               -- Don't load the global modules by default
+                                               set(name, "core", "modules_enable", false);
+                                               rawset(env, "__currenthost", name);
+                                       end
                                end
                end
                env.component = env.Component;