diff options
author | Matthew Wild <mwild1@gmail.com> | 2017-03-17 13:08:31 +0000 |
---|---|---|
committer | Matthew Wild <mwild1@gmail.com> | 2017-03-17 13:08:31 +0000 |
commit | 3f6b2ced44f52b65d774e5f1486c87e71f5ece36 (patch) | |
tree | bde2c18dd96f4ad8dbf284a4e6c95d1172975c37 /plugins | |
parent | 3e5d5895f9365fbecf497d9080f8f5705a3266a6 (diff) | |
parent | b9135dfdd21b5ebb88a86aed3cf41e40af7e8e7e (diff) | |
download | prosody-3f6b2ced44f52b65d774e5f1486c87e71f5ece36.tar.gz prosody-3f6b2ced44f52b65d774e5f1486c87e71f5ece36.zip |
Merge 0.10 -> trunk
Diffstat (limited to 'plugins')
-rw-r--r-- | plugins/mod_pubsub/mod_pubsub.lua | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/plugins/mod_pubsub/mod_pubsub.lua b/plugins/mod_pubsub/mod_pubsub.lua index 18d85c52..8e7bfc53 100644 --- a/plugins/mod_pubsub/mod_pubsub.lua +++ b/plugins/mod_pubsub/mod_pubsub.lua @@ -9,7 +9,7 @@ local xmlns_pubsub_owner = "http://jabber.org/protocol/pubsub#owner"; local autocreate_on_publish = module:get_option_boolean("autocreate_on_publish", false); local autocreate_on_subscribe = module:get_option_boolean("autocreate_on_subscribe", false); -local pubsub_disco_name = module:get_option_string("name" "Prosody PubSub Service"); +local pubsub_disco_name = module:get_option_string("name", "Prosody PubSub Service"); local expose_publisher = module:get_option_boolean("expose_publisher", false) local service; |