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 | 3601968ff85a10f18f1dba92360aac7efabe09ad (patch) | |
tree | 5d9e9dfec7020f862dc40a4b872556e3661b5327 /plugins/mod_disco.lua | |
parent | 33f73b5b885da18cef1b983cd1a1fe6d287e0391 (diff) | |
parent | 4ce8edd6eb83eff68970077e9c3c99df19f5a955 (diff) | |
download | prosody-3601968ff85a10f18f1dba92360aac7efabe09ad.tar.gz prosody-3601968ff85a10f18f1dba92360aac7efabe09ad.zip |
Merge 0.10->trunk
Diffstat (limited to 'plugins/mod_disco.lua')
-rw-r--r-- | plugins/mod_disco.lua | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/plugins/mod_disco.lua b/plugins/mod_disco.lua index c9d4a9df..517fcaec 100644 --- a/plugins/mod_disco.lua +++ b/plugins/mod_disco.lua @@ -13,7 +13,7 @@ local jid_bare = require "util.jid".bare; local st = require "util.stanza" local calculate_hash = require "util.caps".calculate_hash; -local disco_items = module:get_option("disco_items") or {}; +local disco_items = module:get_option_array("disco_items", {}) do -- validate disco_items for _, item in ipairs(disco_items) do local err; |