aboutsummaryrefslogtreecommitdiffstats
path: root/plugins
diff options
context:
space:
mode:
authorKim Alvefur <zash@zash.se>2013-04-17 19:11:57 +0200
committerKim Alvefur <zash@zash.se>2013-04-17 19:11:57 +0200
commit08eceec2bf30cec73020e3926f7dd2fca5aba3ab (patch)
treebbb6068989d701249c75d0626778b76d2343ef54 /plugins
parentb41b25c119c4e4676865ab3748e67a07cd41af71 (diff)
parent012519b6ad7e4a8487b5bb143c081a4e0600a65b (diff)
downloadprosody-08eceec2bf30cec73020e3926f7dd2fca5aba3ab.tar.gz
prosody-08eceec2bf30cec73020e3926f7dd2fca5aba3ab.zip
Merge 0.9->trunk
Diffstat (limited to 'plugins')
-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 4d3911bb..22969ab5 100644
--- a/plugins/mod_pubsub.lua
+++ b/plugins/mod_pubsub.lua
@@ -193,7 +193,9 @@ function handlers.set_publish(origin, stanza, publish)
local id = (item and item.attr.id);
if not id then
id = uuid_generate();
- item.attr.id = id;
+ if item then
+ item.attr.id = id;
+ end
end
local ok, ret = service:publish(node, stanza.attr.from, id, item);
local reply;