]> granicus.if.org Git - ejabberd/commitdiff
Fix missing tag when configuring subscription option (thanks to Clochix)
authorBadlop <badlop@process-one.net>
Tue, 1 Sep 2009 08:18:30 +0000 (08:18 +0000)
committerBadlop <badlop@process-one.net>
Tue, 1 Sep 2009 08:18:30 +0000 (08:18 +0000)
SVN Revision: 2576

src/mod_pubsub/mod_pubsub.erl

index e55bf607e1b6a969fb03c8cccdba70a4386857b3..a3d1ef19fc33ff9100f6ae3d3840775faf9d4a0b 100644 (file)
@@ -2464,7 +2464,17 @@ read_sub(Subscriber, NodeID, SubID, Lang) ->
        {error, notfound} ->
            {error, ?ERR_EXTENDED(?ERR_NOT_ACCEPTABLE, "invalid-subid")};
        {result, #pubsub_subscription{options = Options}} ->
-           pubsub_subscription:get_options_xform(Lang, Options)
+            {result, XdataEl} = pubsub_subscription:get_options_xform(Lang, Options),
+            [N] = mnesia:dirty_match_object({pubsub_node,'_',NodeID,'_','_','_','_'}),
+            {_, Node} = N#pubsub_node.nodeid,
+            NodeIDStr = node_to_string(Node),
+            SubscriberStr = jlib:jid_to_string(Subscriber),
+            OptionsEl = {xmlelement, "options", [{"node", NodeIDStr},
+                                                {"jid", SubscriberStr},
+                                                {"subid", SubID}],
+                        [XdataEl]},
+            PubsubEl = {xmlelement, "pubsub", [{"xmlns", ?NS_PUBSUB}], [OptionsEl]},
+            {result, PubsubEl}
     end.
 
 set_options(Host, Node, JID, SubID, Configuration) ->