aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorKim Alvefur <zash@zash.se>2014-02-06 10:48:41 +0100
committerKim Alvefur <zash@zash.se>2014-02-06 10:48:41 +0100
commit73f394eec544993923ba0b1bbd4eed78051bd59f (patch)
tree0a2c2d79ebad44f4db7d05553885ff5a21a079e7
parentc92bbefd9c5e36913afe0d796a84df180faaf0af (diff)
parentf41583535f4541adbc1356e5212fc47a1a4abdcc (diff)
downloadprosody-73f394eec544993923ba0b1bbd4eed78051bd59f.tar.gz
prosody-73f394eec544993923ba0b1bbd4eed78051bd59f.zip
Merge 0.9->0.10
-rw-r--r--plugins/mod_motd.lua2
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;