prosody
9e4c2b048f9a%3A72cb8b6536b9

Find changesets by keywords by author, files, the commit message, revision number or hash, or revset expression.

Software / code / prosody

Changeset

3509:72cb8b6536b9

Merge with trunk.
author Waqas Hussain <waqas20@gmail.com>
date Mon, 27 Sep 2010 19:51:14 +0500
parents 3506:0f46acca11cc (diff) 3508:9e4c2b048f9a (current diff)
children 3510:711eb5bf94b4
files plugins/muc/muc.lib.lua
diffstat 1 files changed, 1 insertions(+), 1 deletions(-) [+]
line wrap: on
line diff
--- 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