diff options
author | Kim Alvefur <zash@zash.se> | 2014-02-06 10:55:09 +0100 |
---|---|---|
committer | Kim Alvefur <zash@zash.se> | 2014-02-06 10:55:09 +0100 |
commit | db97ec41b600653e046c0d6ee7c2625105a5a761 (patch) | |
tree | 3064e12f6513a9f471d36bf905f4723a7aa3e292 | |
parent | 3b3997eef4a3c50a562efe9c49b3a180ab439dbe (diff) | |
parent | cf20170bb3481dcdd673d14248937eae0d47a3bd (diff) | |
download | prosody-db97ec41b600653e046c0d6ee7c2625105a5a761.tar.gz prosody-db97ec41b600653e046c0d6ee7c2625105a5a761.zip |
Merge 0.10->trunk
-rw-r--r-- | plugins/mod_motd.lua | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/plugins/mod_motd.lua b/plugins/mod_motd.lua index 1e2ee395..574a9cf4 100644 --- a/plugins/mod_motd.lua +++ b/plugins/mod_motd.lua @@ -15,7 +15,7 @@ if not motd_text then return; end local st = require "util.stanza"; -motd_text = motd_text:gsub("^%s*(.-)%s*$", "%1"):gsub("\n%s+", "\n"); -- Strip indentation from the config +motd_text = motd_text:gsub("^%s*(.-)%s*$", "%1"):gsub("\n[ \t]+", "\n"); -- Strip indentation from the config module:hook("presence/bare", function (event) local session, stanza = event.origin, event.stanza; |