aboutsummaryrefslogtreecommitdiffstats
path: root/core/configmanager.lua
diff options
context:
space:
mode:
authorMatthew Wild <mwild1@gmail.com>2010-12-18 23:15:58 +0000
committerMatthew Wild <mwild1@gmail.com>2010-12-18 23:15:58 +0000
commit70c61a59def387a4aa1439aacbdba15a16a702d7 (patch)
tree3152723d0f8a90324f46df41f53c1f342da2435e /core/configmanager.lua
parente8e177385a252d779508d91886dc9d41aabe3a3b (diff)
downloadprosody-70c61a59def387a4aa1439aacbdba15a16a702d7.tar.gz
prosody-70c61a59def387a4aa1439aacbdba15a16a702d7.zip
configmanager: Switch back to returning 'ok' to signal config load success - fixes config errors not being displayed
Diffstat (limited to 'core/configmanager.lua')
-rw-r--r--core/configmanager.lua2
1 files changed, 1 insertions, 1 deletions
diff --git a/core/configmanager.lua b/core/configmanager.lua
index 03679531..52b9fd98 100644
--- a/core/configmanager.lua
+++ b/core/configmanager.lua
@@ -102,7 +102,7 @@ function load(filename, format)
config = config
});
end
- return not not new_config, "parser", err;
+ return ok, "parser", err;
end
return f, "file", err;
end