# HG changeset patch
# User Matthew Wild <mwild1@gmail.com>
# Date 1365431571 -3600
# Node ID 51686426cac20455af62e1fba847907f8ab39b19
# Parent  30ab4e69a50d5547267a531a2f51fc4d77346131# Parent  9054b51e71a4f442107096906be76195ae6bb4b3
Merge 0.9->trunk

diff -r 30ab4e69a50d -r 51686426cac2 plugins/mod_pubsub.lua
--- a/plugins/mod_pubsub.lua	Mon Apr 08 15:05:16 2013 +0100
+++ b/plugins/mod_pubsub.lua	Mon Apr 08 15:32:51 2013 +0100
@@ -22,7 +22,9 @@
 	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);