Merge with waqas

[prosody.git] / core / configmanager.lua

diff --git a/core/configmanager.lua b/core/configmanager.lua
index 37646017407cbc4f61a8b29bbff7baacd9894da1..b7ee605fcdb5bfb1cb6328eab5c7aa51b592b7aa 100644 (file)
--- 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
 -- 
@@ -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 :)
@@ -123,7 +124,7 @@ do
                function env.Component(name)
                        set(name, "core", "component_module", "component");
                        -- Don't load the global modules by default
-                       set(name, "core", "modules_enable", false);
+                       set(name, "core", "load_global_modules", false);
                        rawset(env, "__currenthost", name);
        
                        return function (module)