aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorKim Alvefur <zash@zash.se>2014-02-06 10:55:09 +0100
committerKim Alvefur <zash@zash.se>2014-02-06 10:55:09 +0100
commit6d743a0544280a231a08d8ab6aeedf9d57090c2a (patch)
tree3064e12f6513a9f471d36bf905f4723a7aa3e292
parent7a257adaffd2bc14ac33045c4563d428b41d69cb (diff)
parent73f394eec544993923ba0b1bbd4eed78051bd59f (diff)
downloadprosody-6d743a0544280a231a08d8ab6aeedf9d57090c2a.tar.gz
prosody-6d743a0544280a231a08d8ab6aeedf9d57090c2a.zip
Merge 0.10->trunk
-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;