diff options
| author | Christophe Romain <christophe.romain@process-one.net> | 2014-05-05 13:49:02 +0200 |
|---|---|---|
| committer | Christophe Romain <christophe.romain@process-one.net> | 2014-05-05 17:40:42 +0200 |
| commit | 530ac437586a45b0d251547f03da9933e4d35888 (patch) | |
| tree | b65b7f206044d8543dfab0ed1fa236cc793a28ea /src | |
| parent | Merge pull request #195 from Iperity/master (diff) | |
store item when persist_item=false and cache_last_item=false but need last_item
Diffstat (limited to 'src')
| -rw-r--r-- | src/mod_pubsub.erl | 5 | ||||
| -rw-r--r-- | src/mod_pubsub_odbc.erl | 2 |
2 files changed, 2 insertions, 5 deletions
diff --git a/src/mod_pubsub.erl b/src/mod_pubsub.erl index 0b81265f8..8cbd994e0 100644 --- 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 00e619213..8236447d0 100644 --- 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), |