mod_pubsub: Transplant pieces of cdcfd93e2f43 from trunk

plugins/mod_pubsub/mod_pubsub.lua

@@ -100,7 +100,7 @@ module:hook("host-disco-items-node", function (event)
 		return;
 	end
 
-	for id, item in pairs(ret) do
+	for _, id in ipairs(ret) do
 		reply:tag("item", { jid = module.host, name = id }):up();
 	end
 	event.exists = true;

plugins/mod_pubsub/pubsub.lib.lua

@@ -42,8 +42,8 @@ function handlers.get_items(origin, stanza, items, service)
 	end
 
 	local data = st.stanza("items", { node = node });
-	for _, entry in pairs(results) do
-		data:add_child(entry);
+	for _, id in ipairs(results) do
+		data:add_child(results[id]);
 	end
 	local reply;
 	if data then