1 files changed, 3 insertions, 1 deletions
diff --git a/Swiften/Serializer/PayloadSerializers/PubSubItemSerializer.cpp b/Swiften/Serializer/PayloadSerializers/PubSubItemSerializer.cpp
index 707f183..fbd4d53 100644
--- a/Swiften/Serializer/PayloadSerializers/PubSubItemSerializer.cpp
+++ b/Swiften/Serializer/PayloadSerializers/PubSubItemSerializer.cpp
@@ -1,37 +1,39 @@
 /*
  * Copyright (c) 2013 Remko Tronçon
  * Licensed under the GNU General Public License v3.
  * See Documentation/Licenses/GPLv3.txt for more information.
  */
 
 #pragma clang diagnostic ignored "-Wunused-private-field"
 
 #include <Swiften/Serializer/PayloadSerializers/PubSubItemSerializer.h>
 #include <Swiften/Serializer/XML/XMLElement.h>
 #include <boost/smart_ptr/make_shared.hpp>
 
 #include <Swiften/Serializer/PayloadSerializerCollection.h>
 #include <Swiften/Base/foreach.h>
 #include <Swiften/Serializer/XML/XMLRawTextNode.h>
 
 using namespace Swift;
 
 PubSubItemSerializer::PubSubItemSerializer(PayloadSerializerCollection* serializers) : serializers(serializers) {
 }
 
 PubSubItemSerializer::~PubSubItemSerializer() {
 }
 
 std::string PubSubItemSerializer::serializePayload(boost::shared_ptr<PubSubItem> payload) const {
 	if (!payload) {
 		return "";
 	}
 	XMLElement element("item", "http://jabber.org/protocol/pubsub");
 	foreach(boost::shared_ptr<Payload> item, payload->getData()) {
 		element.addNode(boost::make_shared<XMLRawTextNode>(serializers->getPayloadSerializer(item)->serialize(item)));
 	}
-	element.setAttribute("id", payload->getID());
+	if (!payload->getID().empty()) {
+		element.setAttribute("id", payload->getID());
+	}
 	return element.serialize();
 }