projects
/
prosody.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
f0bfbf3
)
mod_muc: Fix a traceback when an owner joins a room
author
Emmanuel Gil Peyrot
<linkmauve@linkmauve.fr>
Sat, 25 Jul 2015 14:49:00 +0000
(15:49 +0100)
committer
Emmanuel Gil Peyrot
<linkmauve@linkmauve.fr>
Sat, 25 Jul 2015 14:49:00 +0000
(15:49 +0100)
plugins/muc/mod_muc.lua
patch
|
blob
|
history
diff --git
a/plugins/muc/mod_muc.lua
b/plugins/muc/mod_muc.lua
index 03a23e09fc2ce1ad97f1e5712264003dfe9334e9..29cbd7900d860626033aec15b6a2db1edd880559 100644
(file)
--- a/
plugins/muc/mod_muc.lua
+++ b/
plugins/muc/mod_muc.lua
@@
-38,9
+38,9
@@
do -- Monkey patch to make server admins room owners
end
local _set_affiliation = room_mt.set_affiliation;
- function room_mt:set_affiliation(actor, jid,
...
)
+ function room_mt:set_affiliation(actor, jid,
affiliation, reason
)
if affiliation ~= "owner" and is_admin(jid) then return nil, "modify", "not-acceptable"; end
- return _set_affiliation(self, actor, jid,
...
);
+ return _set_affiliation(self, actor, jid,
affiliation, reason
);
end
end