Merge 0.8->trunk.

[prosody.git] / plugins / mod_pubsub.lua

diff --git a/plugins/mod_pubsub.lua b/plugins/mod_pubsub.lua
index 90c198151d220690f739e18535dfa1b150ba1910..b8f7a882ccaf43ce86368899af6fca0794e56a87 100644 (file)
--- a/plugins/mod_pubsub.lua
+++ b/plugins/mod_pubsub.lua
@@ -3,8 +3,6 @@ local st = require "util.stanza";
 local jid_bare = require "util.jid".bare;
 local uuid_generate = require "util.uuid".generate;
 
-require "core.modulemanager".load(module.host, "iq");
-
 local xmlns_pubsub = "http://jabber.org/protocol/pubsub";
 local xmlns_pubsub_errors = "http://jabber.org/protocol/pubsub#errors";
 local xmlns_pubsub_event = "http://jabber.org/protocol/pubsub#event";
@@ -74,7 +72,8 @@ function handlers.get_subscriptions(origin, stanza, subscriptions)
                return origin.send(pubsub_error_reply(stanza, ret));
        end
        local reply = st.reply(stanza)
-               :tag("subscriptions", { xmlns = xmlns_pubsub });
+               :tag("pubsub", { xmlns = xmlns_pubsub })
+                       :tag("subscriptions");
        for _, sub in ipairs(ret) do
                reply:tag("subscription", { node = sub.node, jid = sub.jid, subscription = 'subscribed' }):up();
        end