aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorKim Alvefur <zash@zash.se>2017-06-01 14:05:43 +0200
committerKim Alvefur <zash@zash.se>2017-06-01 14:05:43 +0200
commitaa3eb08cef920e003252cca86120323e14111b52 (patch)
tree49c53bc5895483fbc4eb99b4df317d4c66870b40
parentf65858dd27db2c7d20d80d962e6b4b7ca2858374 (diff)
parentec9e9df9c7cb152c83fc3a2adf40228443cf1799 (diff)
downloadprosody-aa3eb08cef920e003252cca86120323e14111b52.tar.gz
prosody-aa3eb08cef920e003252cca86120323e14111b52.zip
Merge 0.9->0.10
-rw-r--r--plugins/mod_welcome.lua4
1 files changed, 2 insertions, 2 deletions
diff --git a/plugins/mod_welcome.lua b/plugins/mod_welcome.lua
index d74643de..f6b13df5 100644
--- a/plugins/mod_welcome.lua
+++ b/plugins/mod_welcome.lua
@@ -14,8 +14,8 @@ local st = require "util.stanza";
module:hook("user-registered",
function (user)
local welcome_stanza =
- st.message({ to = user.username.."@"..user.host, from = host })
- :tag("body"):text(welcome_text:gsub("$(%w+)", user));
+ st.message({ to = user.username.."@"..user.host, from = host },
+ welcome_text:gsub("$(%w+)", user));
module:send(welcome_stanza);
module:log("debug", "Welcomed user %s@%s", user.username, user.host);
end);