aboutsummaryrefslogtreecommitdiffstats
path: root/plugins
diff options
context:
space:
mode:
authorMatthew Wild <mwild1@gmail.com>2020-04-23 13:52:19 +0100
committerMatthew Wild <mwild1@gmail.com>2020-04-23 13:52:19 +0100
commit4fdc7610738d092181ba0fe5f7fc1e5bee17e90e (patch)
tree7aff8927628435c23c24605936504e27bc3a7624 /plugins
parentff9bdefc7e961f217580194146ee6bda8c6b9827 (diff)
parent145f8fbad7803a1cae4a715254533b63ccc79abf (diff)
downloadprosody-4fdc7610738d092181ba0fe5f7fc1e5bee17e90e.tar.gz
prosody-4fdc7610738d092181ba0fe5f7fc1e5bee17e90e.zip
Merge 0.11->trunk
Diffstat (limited to 'plugins')
-rw-r--r--plugins/muc/muc.lib.lua2
1 files changed, 1 insertions, 1 deletions
diff --git a/plugins/muc/muc.lib.lua b/plugins/muc/muc.lib.lua
index 3b126522..d785a5a2 100644
--- a/plugins/muc/muc.lib.lua
+++ b/plugins/muc/muc.lib.lua
@@ -144,7 +144,7 @@ end
-- actor is the attribute table
local function add_item(x, affiliation, role, jid, nick, actor_nick, actor_jid, reason)
- x:tag("item", {affiliation = affiliation; role = role; jid = jid; nick = nick;})
+ x:tag("item", {affiliation = affiliation or "none"; role = role; jid = jid; nick = nick;})
if actor_nick or actor_jid then
x:tag("actor", {nick = actor_nick; jid = actor_jid;}):up()
end