Merge 0.9->trunk

diff --git a/plugins/mod_pubsub.lua b/plugins/mod_pubsub.lua
index 8f078f54fbd075fe06945d190b1731b56523ebf6..7bd331029a59ac37b095efe4ee189d9f9b7b92f2 100644 (file)
--- a/plugins/mod_pubsub.lua
+++ b/plugins/mod_pubsub.lua
@@ -22,7 +22,9 @@ function handle_pubsub_iq(event)
        local origin, stanza = event.origin, event.stanza;
        local pubsub = stanza.tags[1];
        local action = pubsub.tags[1];
-       if not action then return; end
+       if not action then
+               return origin.send(st.error_reply(stanza, "cancel", "bad-request"));
+       end
        local handler = handlers[stanza.attr.type.."_"..action.name];
        if handler then
                handler(origin, stanza, action);