From 88a3e1b510e41eb050e86cd196fd0f0b575b7cc6 Mon Sep 17 00:00:00 2001
From: Christophe Romain <christophe.romain@process-one.net>
Date: Tue, 11 Jun 2019 10:18:36 +0200
Subject: [PATCH] =?UTF-8?q?Revert=20"Fix=20pubsub=20compliance=20XEP-0060?=
 =?UTF-8?q?=20=C2=A7=207.1.3.6=20(#2864)"?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

This reverts commit 2fff4d1ea6f32babc3ae06ef877faaacb8ba3c1b.
This commit broke the XEP compliance. more details here
https://xmpp.org/extensions/xep-0060.html#events
---
 src/mod_pubsub.erl | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/mod_pubsub.erl b/src/mod_pubsub.erl
index ea6113e4b..1f220f3c6 100644
--- a/src/mod_pubsub.erl
+++ b/src/mod_pubsub.erl
@@ -1805,7 +1805,7 @@ publish_item(Host, ServerHost, Node, Publisher, ItemId, Payload, PubOpts, Access
 		(DeliverPayloads or PersistItems) and (PayloadCount > 1) ->
 		    {error, extended_error(xmpp:err_bad_request(),
 					   err_invalid_payload())};
-		(not DeliverPayloads) and (PayloadCount > 0) ->
+		(not (DeliverPayloads or PersistItems)) and (PayloadCount > 0) ->
 		    {error, extended_error(xmpp:err_bad_request(),
 					   err_item_forbidden())};
 		true ->