aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMatthew Wild <mwild1@gmail.com>2013-04-08 15:05:16 +0100
committerMatthew Wild <mwild1@gmail.com>2013-04-08 15:05:16 +0100
commita72f414de3b5f90f72883ae142a2b14b7438851b (patch)
tree1b593804084acf9148f1016283a985ef04bd52c2
parentfa09a82b6e040692b27dc9a11724a34457942483 (diff)
parente4f2da44a124f35514e5767fcd4485bdda648edb (diff)
downloadprosody-a72f414de3b5f90f72883ae142a2b14b7438851b.tar.gz
prosody-a72f414de3b5f90f72883ae142a2b14b7438851b.zip
Merge 0.9->trunk
-rw-r--r--plugins/mod_pubsub.lua1
1 files changed, 1 insertions, 0 deletions
diff --git a/plugins/mod_pubsub.lua b/plugins/mod_pubsub.lua
index 5ff3a029..8f078f54 100644
--- a/plugins/mod_pubsub.lua
+++ b/plugins/mod_pubsub.lua
@@ -22,6 +22,7 @@ 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
local handler = handlers[stanza.attr.type.."_"..action.name];
if handler then
handler(origin, stanza, action);