store item when persist_item=false and cache_last_item=false but need last_item

diff --git a/src/mod_pubsub.erl b/src/mod_pubsub.erl
index 0b81265f8cb905973d6aeecc0051667ceb897748..8cbd994e020db1ba061a49cc656b092597ff6ac1 100644 (file)
--- a/src/mod_pubsub.erl
+++ b/src/mod_pubsub.erl
@@ -2952,10 +2952,7 @@ publish_item(Host, ServerHost, Node, Publisher, ItemId, Payload, Access) ->
                     PublishModel = get_option(Options, publish_model),
                     DeliverPayloads = get_option(Options, deliver_payloads),
                     PersistItems = get_option(Options, persist_items),
-                    MaxItems = case PersistItems of
-                                 false -> 0;
-                                 true -> max_items(Host, Options)
-                               end,
+                    MaxItems = max_items(Host, Options),
                     PayloadCount = payload_xmlelements(Payload),
                     PayloadSize = byte_size(term_to_binary(Payload)) - 2,
                     PayloadMaxSize = get_option(Options, max_payload_size),

diff --git a/src/mod_pubsub_odbc.erl b/src/mod_pubsub_odbc.erl
index 00e619213306eff2387cf321c40f658f0305c7df..8236447d0b87ed29e686ad093d2938c9b8398c3c 100644 (file)
--- a/src/mod_pubsub_odbc.erl
+++ b/src/mod_pubsub_odbc.erl
@@ -2618,9 +2618,9 @@ publish_item(Host, ServerHost, Node, Publisher, ItemId, Payload, Access) ->
                     Features = features(Type),
                     PublishFeature = lists:member(<<"publish">>, Features),
                     PublishModel = get_option(Options, publish_model),
-                    MaxItems = max_items(Host, Options),
                     DeliverPayloads = get_option(Options, deliver_payloads),
                     PersistItems = get_option(Options, persist_items),
+                    MaxItems = max_items(Host, Options),
                     PayloadCount = payload_xmlelements(Payload),
                     PayloadSize = byte_size(term_to_binary(Payload)) - 2,
                     PayloadMaxSize = get_option(Options, max_payload_size),