aboutsummaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorChristophe Romain <christophe.romain@process-one.net>2019-06-11 10:18:36 +0200
committerChristophe Romain <christophe.romain@process-one.net>2019-06-11 10:18:36 +0200
commit88a3e1b510e41eb050e86cd196fd0f0b575b7cc6 (patch)
tree088bd50bf744d2b21cc5ff21f25302cc144f817b /src
parentlock.yml defines locking policy for old issues (diff)
Revert "Fix pubsub compliance XEP-0060 ยง 7.1.3.6 (#2864)"
This reverts commit 2fff4d1ea6f32babc3ae06ef877faaacb8ba3c1b. This commit broke the XEP compliance. more details here https://xmpp.org/extensions/xep-0060.html#events
Diffstat (limited to 'src')
-rw-r--r--src/mod_pubsub.erl2
1 files changed, 1 insertions, 1 deletions
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 ->