aboutsummaryrefslogtreecommitdiffstats
path: root/plugins
diff options
context:
space:
mode:
authorKim Alvefur <zash@zash.se>2018-08-31 23:54:13 +0200
committerKim Alvefur <zash@zash.se>2018-08-31 23:54:13 +0200
commit8957ef2f7d72ed9817dd9bbac3afc61e1aa989b2 (patch)
tree067d6a3af35dd2d6de0047d6fac94cf99fc1b621 /plugins
parent6b22fae6036298bf69b5f4d6573768e049e7a791 (diff)
downloadprosody-8957ef2f7d72ed9817dd9bbac3afc61e1aa989b2.tar.gz
prosody-8957ef2f7d72ed9817dd9bbac3afc61e1aa989b2.zip
mod_pubsub: Preserve current subscription options if given a partial form
Diffstat (limited to 'plugins')
-rw-r--r--plugins/mod_pubsub/pubsub.lib.lua3
1 files changed, 2 insertions, 1 deletions
diff --git a/plugins/mod_pubsub/pubsub.lib.lua b/plugins/mod_pubsub/pubsub.lib.lua
index 7b89aaed..4b37946d 100644
--- a/plugins/mod_pubsub/pubsub.lib.lua
+++ b/plugins/mod_pubsub/pubsub.lib.lua
@@ -572,7 +572,8 @@ function handlers.set_options(origin, stanza, options, service)
origin.send(pubsub_error_reply(stanza, "not-subscribed"));
return true;
end
- local new_subopts, err = subscribe_options_form:data(options.tags[1]);
+ local old_subopts = ret;
+ local new_subopts, err = subscribe_options_form:data(options.tags[1], old_subopts);
if not new_subopts then
origin.send(pubsub_error_reply(stanza, ret));
return true;