Merge 0.9->trunk
authorMatthew Wild <mwild1@gmail.com>
Mon, 08 Apr 2013 15:05:16 +0100
changeset 5444 30ab4e69a50d
parent 5442 e66973c81e89 (current diff)
parent 5443 92615cfa2270 (diff)
child 5446 51686426cac2
Merge 0.9->trunk
--- a/plugins/mod_pubsub.lua	Mon Apr 08 12:08:34 2013 +0100
+++ b/plugins/mod_pubsub.lua	Mon Apr 08 15:05:16 2013 +0100
@@ -22,6 +22,7 @@
 	local origin, stanza = event.origin, event.stanza;
 	local pubsub = stanza.tags[1];
 	local action = pubsub.tags[1];
+	if not action then return; end
 	local handler = handlers[stanza.attr.type.."_"..action.name];
 	if handler then
 		handler(origin, stanza, action);