aboutsummaryrefslogtreecommitdiffstats
path: root/plugins/muc
diff options
context:
space:
mode:
authorMatthew Wild <mwild1@gmail.com>2018-09-13 14:46:24 +0100
committerMatthew Wild <mwild1@gmail.com>2018-09-13 14:46:24 +0100
commit235281229dc3626581aeb409ac4db1c04fb39f72 (patch)
tree5f9bf30950e5df9d1237ec36cc7030fcd39dbd20 /plugins/muc
parent9e8c327fabd2e65d51b4afb420f9cf72fe7bbff8 (diff)
downloadprosody-235281229dc3626581aeb409ac4db1c04fb39f72.tar.gz
prosody-235281229dc3626581aeb409ac4db1c04fb39f72.zip
MUC: If a user with an existing affiliation registers, preserve that affiliation (thanks jc)
Diffstat (limited to 'plugins/muc')
-rw-r--r--plugins/muc/register.lib.lua2
1 files changed, 1 insertions, 1 deletions
diff --git a/plugins/muc/register.lib.lua b/plugins/muc/register.lib.lua
index f9841e06..21cb3f2f 100644
--- a/plugins/muc/register.lib.lua
+++ b/plugins/muc/register.lib.lua
@@ -174,7 +174,7 @@ local function handle_register_iq(room, origin, stanza)
-- Checks passed, save the registration
if registered_nick ~= desired_nick then
local registration_data = { reserved_nickname = desired_nick };
- local ok, err_type, err_condition = room:set_affiliation(true, user_jid, "member", nil, registration_data);
+ local ok, err_type, err_condition = room:set_affiliation(true, user_jid, affiliation or "member", nil, registration_data);
if not ok then
origin.send(st.error_reply(stanza, err_type, err_condition));
return true;