mod_watchregistrations: Fixed an undefined global access (thanks Medics).

[prosody.git] / prosody

diff --git a/prosody b/prosody
index 3f3284335a39aa789c079fe9f97d2a4343d3a830..e18b4e61c94b57bdac591e6c8590109d2eac0918 100755 (executable)
--- a/prosody
+++ b/prosody
@@ -203,7 +203,7 @@ function init_global_state()
                -- path1;path2;path3;defaultpath...
                CFG_PLUGINDIR = table.concat(custom_plugin_paths, path_sep)..path_sep..(CFG_PLUGINDIR or "plugins");
        end
-       prosody.paths = { source = CFG_SOURCEDIR, config = CFG_CONFIGDIR, 
+       prosody.paths = { source = CFG_SOURCEDIR, config = CFG_CONFIGDIR or ".", 
                          plugins = CFG_PLUGINDIR or "plugins", data = data_path };
 
        prosody.arg = _G.arg;
@@ -338,7 +338,7 @@ function load_secondary_libraries()
        require "core.sessionmanager"
        require "core.stanza_router"
        package.loaded['core.componentmanager'] = setmetatable({},{__index=function()
-               log("warn", "componentmanager is deprecated: %s", debug.traceback():match("\n[^\n]*\n[\s\t]*([^\n]*)"));
+               log("warn", "componentmanager is deprecated: %s", debug.traceback():match("\n[^\n]*\n[ \t]*([^\n]*)"));
                return function() end
        end});