aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMatthew Wild <mwild1@gmail.com>2013-04-08 15:32:51 +0100
committerMatthew Wild <mwild1@gmail.com>2013-04-08 15:32:51 +0100
commit4f4ea37379152abaee179a750a24f7019c405583 (patch)
treefc78ef5c157ed829188a235259e105fc4d72c748
parenta72f414de3b5f90f72883ae142a2b14b7438851b (diff)
parent2d2a63e24d15a5cb5a26331f2421de7a63f38105 (diff)
downloadprosody-4f4ea37379152abaee179a750a24f7019c405583.tar.gz
prosody-4f4ea37379152abaee179a750a24f7019c405583.zip
Merge 0.9->trunk
-rw-r--r--plugins/mod_pubsub.lua4
1 files changed, 3 insertions, 1 deletions
diff --git a/plugins/mod_pubsub.lua b/plugins/mod_pubsub.lua
index 8f078f54..7bd33102 100644
--- 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);