aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBadlop <badlop@process-one.net>2008-01-01 17:06:26 +0000
committerBadlop <badlop@process-one.net>2008-01-01 17:06:26 +0000
commitc2e12d716bceff9aef302c43f886cf3b06596e4d (patch)
treecfe53bf764226a64e39372aa795348b945b61ed2
parent* src/ejabberdctl.template: Create logs_dir if doesn't exist. New (diff)
* src/mod_muc/mod_muc_room.erl: Resend 'continue' elements in muc
room invitations (EJAB-490) SVN Revision: 1135
-rw-r--r--ChangeLog3
-rw-r--r--src/mod_muc/mod_muc_room.erl9
2 files changed, 11 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog
index 17dc882b5..d8d03f381 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,8 @@
2008-01-01 Badlop <badlop@process-one.net>
+ * src/mod_muc/mod_muc_room.erl: Resend 'continue' elements in muc
+ room invitations (EJAB-490)
+
* src/ejabberdctl.template: Create logs_dir if doesn't exist. New
parameters --config, --ctl-config, --logs, --spool. Crash dump
renamed to erl_crash_DATETIME.dump.
diff --git a/src/mod_muc/mod_muc_room.erl b/src/mod_muc/mod_muc_room.erl
index c35b86364..b738cee07 100644
--- a/src/mod_muc/mod_muc_room.erl
+++ b/src/mod_muc/mod_muc_room.erl
@@ -2975,12 +2975,19 @@ check_invitation(From, Els, Lang, StateData) ->
xml:get_path_s(
InviteEl,
[{elem, "reason"}, cdata]),
+ ContinueEl =
+ case xml:get_path_s(
+ InviteEl,
+ [{elem, "continue"}]) of
+ [] -> [];
+ Continue1 -> [Continue1]
+ end,
IEl =
[{xmlelement, "invite",
[{"from",
jlib:jid_to_string(From)}],
[{xmlelement, "reason", [],
- [{xmlcdata, Reason}]}]}],
+ [{xmlcdata, Reason}]}] ++ ContinueEl}],
PasswdEl =
case (StateData#state.config)#config.password_protected of
true ->