diff options
| author | Kim Alvefur <zash@zash.se> | 2014-02-06 10:48:41 +0100 |
|---|---|---|
| committer | Kim Alvefur <zash@zash.se> | 2014-02-06 10:48:41 +0100 |
| commit | cf20170bb3481dcdd673d14248937eae0d47a3bd (patch) | |
| tree | 0a2c2d79ebad44f4db7d05553885ff5a21a079e7 | |
| parent | 468a94a982d801d63812023fddb40baca2b9ef62 (diff) | |
| parent | 279b6cb27f71ded4e11976f7af799eeaf6b4119e (diff) | |
| download | prosody-cf20170bb3481dcdd673d14248937eae0d47a3bd.tar.gz prosody-cf20170bb3481dcdd673d14248937eae0d47a3bd.zip | |
Merge 0.9->0.10
| -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; |