From: Badlop <badlop@process-one.net>
Date: Tue, 1 Sep 2009 08:18:30 +0000 (+0000)
Subject: Fix missing tag when configuring subscription option (thanks to Clochix)
X-Git-Tag: v2.1.0~18^2~63
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=55fef3c3e7e88472ed368f2c7b87cbb035297b32;p=ejabberd

Fix missing tag when configuring subscription option (thanks to Clochix)

SVN Revision: 2576
---

diff --git a/src/mod_pubsub/mod_pubsub.erl b/src/mod_pubsub/mod_pubsub.erl
index e55bf607e..a3d1ef19f 100644
--- a/src/mod_pubsub/mod_pubsub.erl
+++ b/src/mod_pubsub/mod_pubsub.erl
@@ -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) ->