diff options
| author | Kim Alvefur <zash@zash.se> | 2018-10-30 19:18:03 +0100 |
|---|---|---|
| committer | Kim Alvefur <zash@zash.se> | 2018-10-30 19:18:03 +0100 |
| commit | d4b9a212559e6299828ff50c39bbe9d66dd804a5 (patch) | |
| tree | d45a700056f75e5f329a23a6ea76b7d2184e4070 /plugins | |
| parent | b755ba0921d0be12b002a25803acd648d52d4274 (diff) | |
| parent | 18a51e456f7153e3f34f41d08be3c81948492a3e (diff) | |
| download | prosody-d4b9a212559e6299828ff50c39bbe9d66dd804a5.tar.gz prosody-d4b9a212559e6299828ff50c39bbe9d66dd804a5.zip | |
Merge 0.11->trunk
Diffstat (limited to 'plugins')
| -rw-r--r-- | plugins/mod_pep.lua | 2 | ||||
| -rw-r--r-- | plugins/mod_pubsub/mod_pubsub.lua | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/plugins/mod_pep.lua b/plugins/mod_pep.lua index 681e5be8..1d8c55bf 100644 --- a/plugins/mod_pep.lua +++ b/plugins/mod_pep.lua @@ -464,6 +464,6 @@ module:hook("account-disco-items", function(event) if not ok then return; end for node, node_obj in pairs(ret) do - reply:tag("item", { jid = user_bare, node = node, name = node_obj.config.name }):up(); + reply:tag("item", { jid = user_bare, node = node, name = node_obj.config.title }):up(); end end); diff --git a/plugins/mod_pubsub/mod_pubsub.lua b/plugins/mod_pubsub/mod_pubsub.lua index 05d2d663..40adcafe 100644 --- a/plugins/mod_pubsub/mod_pubsub.lua +++ b/plugins/mod_pubsub/mod_pubsub.lua @@ -152,7 +152,7 @@ module:hook("host-disco-items", function (event) return; end for node, node_obj in pairs(ret) do - reply:tag("item", { jid = module.host, node = node, name = node_obj.config.name }):up(); + reply:tag("item", { jid = module.host, node = node, name = node_obj.config.title }):up(); end end); |