Diff

plugins/mod_pubsub/mod_pubsub.lua @ 7982:e30b0cbed472

Merge 0.10->trunk
author Kim Alvefur <zash@zash.se>
date Thu, 16 Mar 2017 23:49:27 +0100
parent 7717:9c8eb0239eef
parent 7980:241f02bd66ce
child 7984:ae3c5abb3336
line wrap: on
line diff
--- a/plugins/mod_pubsub/mod_pubsub.lua	Sun Mar 12 12:52:55 2017 +0100
+++ b/plugins/mod_pubsub/mod_pubsub.lua	Thu Mar 16 23:49:27 2017 +0100
@@ -9,8 +9,7 @@
 
 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;