# HG changeset patch
# User Kim Alvefur <zash@zash.se>
# Date 1535752453 -7200
# Node ID 7fbcabee6df1d0f6ad4cc690a25ca6b6451dab2b
# Parent  d00e8ec7ece2cefabfccaa50d61ecb064df04f96
mod_pubsub: Preserve current subscription options if given a partial form

diff -r d00e8ec7ece2 -r 7fbcabee6df1 plugins/mod_pubsub/pubsub.lib.lua
--- a/plugins/mod_pubsub/pubsub.lib.lua	Fri Aug 31 21:57:04 2018 +0200
+++ b/plugins/mod_pubsub/pubsub.lib.lua	Fri Aug 31 23:54:13 2018 +0200
@@ -572,7 +572,8 @@
 		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;