Comparison

plugins/mod_pubsub/mod_pubsub.lua @ 7984:ae3c5abb3336

Merge 0.10 -> trunk
author Matthew Wild <mwild1@gmail.com>
date Fri, 17 Mar 2017 13:08:31 +0000
parent 7982:e30b0cbed472
parent 7983:879be73c0a58
child 8210:352d605b1178
comparison
equal deleted inserted replaced
7982:e30b0cbed472 7984:ae3c5abb3336
7 local xmlns_pubsub_event = "http://jabber.org/protocol/pubsub#event"; 7 local xmlns_pubsub_event = "http://jabber.org/protocol/pubsub#event";
8 local xmlns_pubsub_owner = "http://jabber.org/protocol/pubsub#owner"; 8 local xmlns_pubsub_owner = "http://jabber.org/protocol/pubsub#owner";
9 9
10 local autocreate_on_publish = module:get_option_boolean("autocreate_on_publish", false); 10 local autocreate_on_publish = module:get_option_boolean("autocreate_on_publish", false);
11 local autocreate_on_subscribe = module:get_option_boolean("autocreate_on_subscribe", false); 11 local autocreate_on_subscribe = module:get_option_boolean("autocreate_on_subscribe", false);
12 local pubsub_disco_name = module:get_option_string("name" "Prosody PubSub Service"); 12 local pubsub_disco_name = module:get_option_string("name", "Prosody PubSub Service");
13 local expose_publisher = module:get_option_boolean("expose_publisher", false) 13 local expose_publisher = module:get_option_boolean("expose_publisher", false)
14 14
15 local service; 15 local service;
16 16
17 local lib_pubsub = module:require "pubsub"; 17 local lib_pubsub = module:require "pubsub";