aboutsummaryrefslogtreecommitdiffstats
path: root/plugins/mod_pubsub/mod_pubsub.lua
diff options
context:
space:
mode:
authorKim Alvefur <zash@zash.se>2017-03-16 23:49:27 +0100
committerKim Alvefur <zash@zash.se>2017-03-16 23:49:27 +0100
commit3601968ff85a10f18f1dba92360aac7efabe09ad (patch)
tree5d9e9dfec7020f862dc40a4b872556e3661b5327 /plugins/mod_pubsub/mod_pubsub.lua
parent33f73b5b885da18cef1b983cd1a1fe6d287e0391 (diff)
parent4ce8edd6eb83eff68970077e9c3c99df19f5a955 (diff)
downloadprosody-3601968ff85a10f18f1dba92360aac7efabe09ad.tar.gz
prosody-3601968ff85a10f18f1dba92360aac7efabe09ad.zip
Merge 0.10->trunk
Diffstat (limited to 'plugins/mod_pubsub/mod_pubsub.lua')
-rw-r--r--plugins/mod_pubsub/mod_pubsub.lua3
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;