# HG changeset patch
# User Matthew Wild <mwild1@gmail.com>
# Date 1371128218 -3600
# Node ID 624b874059bf79af711a5444a6f29467ff0ca741
# Parent  43cc1f95395e0d7def2eb40a5f6526adc228e5ad# Parent  e7b9ba2d0638dc800a7e73d66899ee04f78e8ed9
Merge 0.9->trunk

diff -r 43cc1f95395e -r 624b874059bf plugins/mod_pep.lua
--- a/plugins/mod_pep.lua	Thu Jun 13 12:07:46 2013 +0100
+++ b/plugins/mod_pep.lua	Thu Jun 13 13:56:58 2013 +0100
@@ -62,7 +62,7 @@
 		end
 	else
 		if not user_data then user_data = {}; data[bare] = user_data; end
-		user_data[node] = {id or "1", item};
+		user_data[node] = {id, item};
 	end
 
 	-- broadcast
@@ -169,7 +169,8 @@
 			local node = payload.attr.node;
 			payload = payload.tags[1];
 			if payload and payload.name == "item" then -- <item>
-				local id = payload.attr.id;
+				local id = payload.attr.id or "1";
+				payload.attr.id = id;
 				session.send(st.reply(stanza));
 				publish(session, node, id, st.clone(payload));
 				return true;