# HG changeset patch
# User Matthew Wild <mwild1@gmail.com>
# Date 1366204802 -3600
# Node ID 415e520e4a4c1771ef4d00f72a6ad8826f1756ad
# Parent  de19e6005f1a7ae59c6afbee43f9df69d0400e6f# Parent  81c599c7588b30fddcd167fc72854a3bdf2dc1b1
Merge 0.9->trunk

diff -r de19e6005f1a -r 415e520e4a4c plugins/mod_pubsub.lua
--- a/plugins/mod_pubsub.lua	Mon Apr 15 21:26:20 2013 +0100
+++ b/plugins/mod_pubsub.lua	Wed Apr 17 14:20:02 2013 +0100
@@ -190,7 +190,11 @@
 		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