aboutsummaryrefslogtreecommitdiffstats
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
commita64a22accd5e565b66204001e7183227cabd7866 (patch)
treef89adcb4bdcbb588bce7d6c2f44ef0ac8f431d3c
parentd4f711759844179c2f3250b7b18f61aec11a2f6b (diff)
downloadprosody-a64a22accd5e565b66204001e7183227cabd7866.tar.gz
prosody-a64a22accd5e565b66204001e7183227cabd7866.zip
configmanager: Switch back to returning 'ok' to signal config load success - fixes config errors not being displayed
-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