summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChristophe Romain <christophe.romain@process-one.net>2008-01-12 19:47:19 +0000
committerChristophe Romain <christophe.romain@process-one.net>2008-01-12 19:47:19 +0000
commitaa685c77946a5774b369ebffd57fadbab072da8f (patch)
treef764decca152874116deb5c45436b208a9becab3
parentdon't ask capabilities to MUC room participants (diff)
set_subscription fix (EJAB-494)
SVN Revision: 1148
-rw-r--r--ChangeLog4
-rw-r--r--src/mod_pubsub/mod_pubsub.erl2
2 files changed, 5 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog
index 6fddcda9..191fc59f 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2008-01-12 Christophe Romain <christophe.romain@process-one.net>
+
+ * src/mod_pubsub/mod_pubsub.erl: set_subscription fix (EJAB-494)
+
2008-01-11 Christophe Romain <christophe.romain@process-one.net>
* src/mod_caps.erl: don't ask capabilities to MUC room participants
diff --git a/src/mod_pubsub/mod_pubsub.erl b/src/mod_pubsub/mod_pubsub.erl
index 31a831cb..17053e5c 100644
--- a/src/mod_pubsub/mod_pubsub.erl
+++ b/src/mod_pubsub/mod_pubsub.erl
@@ -1912,7 +1912,7 @@ set_subscriptions(Host, Node, From, EntitiesEls) ->
error;
_ ->
case El of
- {xmlelement, "subscriptions", Attrs, _} ->
+ {xmlelement, "subscription", Attrs, _} ->
JID = jlib:string_to_jid(
xml:get_attr_s("jid", Attrs)),
Subscription = string_to_subscription(