diff options
| author | Kim Alvefur <zash@zash.se> | 2017-03-16 23:49:27 +0100 |
|---|---|---|
| committer | Kim Alvefur <zash@zash.se> | 2017-03-16 23:49:27 +0100 |
| commit | 3e5d5895f9365fbecf497d9080f8f5705a3266a6 (patch) | |
| tree | 5d9e9dfec7020f862dc40a4b872556e3661b5327 /plugins/mod_pubsub | |
| parent | 5b35a9ffb3c7d9cc46c10d788b1dd573f11b1688 (diff) | |
| parent | a374056fa56185322141484732d963abdee02941 (diff) | |
| download | prosody-3e5d5895f9365fbecf497d9080f8f5705a3266a6.tar.gz prosody-3e5d5895f9365fbecf497d9080f8f5705a3266a6.zip | |
Merge 0.10->trunk
Diffstat (limited to 'plugins/mod_pubsub')
| -rw-r--r-- | plugins/mod_pubsub/mod_pubsub.lua | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/plugins/mod_pubsub/mod_pubsub.lua b/plugins/mod_pubsub/mod_pubsub.lua index 2b878ed8..18d85c52 100644 --- a/plugins/mod_pubsub/mod_pubsub.lua +++ b/plugins/mod_pubsub/mod_pubsub.lua @@ -9,8 +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("name"); -if type(pubsub_disco_name) ~= "string" then pubsub_disco_name = "Prosody PubSub Service"; end +local pubsub_disco_name = module:get_option_string("name" "Prosody PubSub Service"); local expose_publisher = module:get_option_boolean("expose_publisher", false) local service; |