Mercurial > lxmppd-hg-xmllex / changeset
changeset
Merge with trunk.
Mon, 27 Sep 2010 19:51:14 +0500
- author
- Waqas Hussain <waqas20@gmail.com>
- date
- Mon, 27 Sep 2010 19:51:14 +0500
- changeset 3509
- 72cb8b6536b9
- parent 3506
- 0f46acca11cc (diff)
- parent 3508
- 9e4c2b048f9a (current diff)
- child 3510
- 711eb5bf94b4
Merge with trunk.
| plugins/muc/muc.lib.lua | file | annotate | diff | comparison | revisions |
--- a/plugins/muc/muc.lib.lua Sun Sep 26 18:15:30 2010 +0200 +++ b/plugins/muc/muc.lib.lua Mon Sep 27 19:51:14 2010 +0500 @@ -251,7 +251,7 @@ local function build_unavailable_presence_from_error(stanza) local type, condition, text = stanza:get_error(); - local error_message = "Kicked: "..condition:gsub("%-", " "); + local error_message = "Kicked: "..(condition and condition:gsub("%-", " ") or "presence error"); if text then error_message = error_message..": "..text; end
