Merge 0.10->trunk

[prosody.git] / plugins / mod_welcome.lua

diff --git a/plugins/mod_welcome.lua b/plugins/mod_welcome.lua
index cd5118a74506a03311b572a180f5fb62d432b83c..d74643de174ca4ff46fec5fe1ec51977f3148b28 100644 (file)
--- a/plugins/mod_welcome.lua
+++ b/plugins/mod_welcome.lua
@@ -7,7 +7,7 @@
 --
 
 local host = module:get_host();
-local welcome_text = module:get_option_string("welcome_message") or "Hello $username, welcome to the $host IM server!";
+local welcome_text = module:get_option_string("welcome_message", "Hello $username, welcome to the $host IM server!");
 
 local st = require "util.stanza";