aboutsummaryrefslogtreecommitdiffstats
path: root/plugins/mod_disco.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
commit3e5d5895f9365fbecf497d9080f8f5705a3266a6 (patch)
tree5d9e9dfec7020f862dc40a4b872556e3661b5327 /plugins/mod_disco.lua
parent5b35a9ffb3c7d9cc46c10d788b1dd573f11b1688 (diff)
parenta374056fa56185322141484732d963abdee02941 (diff)
downloadprosody-3e5d5895f9365fbecf497d9080f8f5705a3266a6.tar.gz
prosody-3e5d5895f9365fbecf497d9080f8f5705a3266a6.zip
Merge 0.10->trunk
Diffstat (limited to 'plugins/mod_disco.lua')
-rw-r--r--plugins/mod_disco.lua2
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;