Merge 0.9->0.10

[prosody.git] / plugins / mod_pubsub / pubsub.lib.lua

diff --git a/plugins/mod_pubsub/pubsub.lib.lua b/plugins/mod_pubsub/pubsub.lib.lua
index b74c90a7d5241f4f32924ae96a48acbf97d61914..d85c71be6db35a554965b49b4ae7622eefd4ad90 100644 (file)
--- a/plugins/mod_pubsub/pubsub.lib.lua
+++ b/plugins/mod_pubsub/pubsub.lib.lua
@@ -18,7 +18,7 @@ local pubsub_errors = {
        ["nodeid-required"] = { "modify", "bad-request", nil, "nodeid-required" };
        ["item-not-found"] = { "cancel", "item-not-found" };
        ["not-subscribed"] = { "modify", "unexpected-request", nil, "not-subscribed" };
-       ["forbidden"] = { "cancel", "forbidden" };
+       ["forbidden"] = { "auth", "forbidden" };
        ["not-allowed"] = { "cancel", "not-allowed" };
 };
 local function pubsub_error_reply(stanza, error)
@@ -283,7 +283,7 @@ function handlers.get_default(origin, stanza, default, service)
        local reply = st.reply(stanza)
                :tag("pubsub", { xmlns = xmlns_pubsub_owner })
                        :tag("default")
-                               :add_child(node_config_form:form(service.node_default_config));
+                               :add_child(node_config_form:form(service.node_defaults));
        return origin.send(reply);
 end