# HG changeset patch
# User Matthew Wild <mwild1@gmail.com>
# Date 1533551131 -3600
# Node ID d0d676b86013083d1c09dd9e5b16ed3cbdcab4f3
# Parent  74525b8104d5b14dd31dc363db327da9716db204
pubsub.lib: Enable publish-options unconditionally

diff -r 74525b8104d5 -r d0d676b86013 plugins/mod_pubsub/pubsub.lib.lua
--- a/plugins/mod_pubsub/pubsub.lib.lua	Mon Aug 06 11:23:42 2018 +0100
+++ b/plugins/mod_pubsub/pubsub.lib.lua	Mon Aug 06 11:25:31 2018 +0100
@@ -12,8 +12,6 @@
 local xmlns_pubsub_errors = "http://jabber.org/protocol/pubsub#errors";
 local xmlns_pubsub_owner = "http://jabber.org/protocol/pubsub#owner";
 
-local enable_publish_options = module:get_option_boolean("enable_publish_options", true);
-
 local _M = {};
 
 local handlers = {};
@@ -198,7 +196,7 @@
 	get_items = { "retrieve-items" };
 	get_subscriptions = { "retrieve-subscriptions" };
 	node_defaults = { "retrieve-default" };
-	publish = { "publish", "multi-items", enable_publish_options and "publish-options" or nil };
+	publish = { "publish", "multi-items", "publish-options" };
 	purge = { "purge-nodes" };
 	retract = { "delete-items", "retract-items" };
 	set_node_config = { "config-node" };
@@ -563,7 +561,7 @@
 		return true;
 	end
 	local publish_options = stanza.tags[1]:get_child("publish-options");
-	if enable_publish_options and publish_options then
+	if publish_options then
 		-- Ensure that the node configuration matches the values in publish-options
 		local publish_options_form = publish_options:get_child("x", "jabber:x:data");
 		local required_config = config_from_xep0060(node_config_form:data(publish_options_form), true);