diff options
| author | Matthew Wild <mwild1@gmail.com> | 2013-04-17 14:20:02 +0100 |
|---|---|---|
| committer | Matthew Wild <mwild1@gmail.com> | 2013-04-17 14:20:02 +0100 |
| commit | b41b25c119c4e4676865ab3748e67a07cd41af71 (patch) | |
| tree | 0c90ca4d14ad5a045fe03a72052e3d1f8aa28829 /plugins/mod_pubsub.lua | |
| parent | 1ed9154f6b3ea8039df0b02f306b6a3682d3f024 (diff) | |
| parent | 3ac1ca54c7d0ba763cb2950e139a789feaaa1e44 (diff) | |
| download | prosody-b41b25c119c4e4676865ab3748e67a07cd41af71.tar.gz prosody-b41b25c119c4e4676865ab3748e67a07cd41af71.zip | |
Merge 0.9->trunk
Diffstat (limited to 'plugins/mod_pubsub.lua')
| -rw-r--r-- | plugins/mod_pubsub.lua | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/plugins/mod_pubsub.lua b/plugins/mod_pubsub.lua index 7bd33102..4d3911bb 100644 --- a/plugins/mod_pubsub.lua +++ b/plugins/mod_pubsub.lua @@ -190,7 +190,11 @@ function handlers.set_publish(origin, stanza, publish) return origin.send(pubsub_error_reply(stanza, "nodeid-required")); end local item = publish:get_child("item"); - local id = (item and item.attr.id) or uuid_generate(); + local id = (item and item.attr.id); + if not id then + id = uuid_generate(); + item.attr.id = id; + end local ok, ret = service:publish(node, stanza.attr.from, id, item); local reply; if ok then |