# HG changeset patch
# User Matthew Wild <mwild1@gmail.com>
# Date 1545261270 0
# Node ID 537f6a27bdb632585035889c49e22a17d94d678d
# Parent  7e21ffbf7ca5543ffc169f4e9f199af11fdaa2d5# Parent  5281a795d6dfece4cdafd95bfe204573e3bf1985
Merge 0.11->trunk

diff -r 7e21ffbf7ca5 -r 537f6a27bdb6 plugins/muc/members_only.lib.lua
--- a/plugins/muc/members_only.lib.lua	Wed Dec 19 16:54:25 2018 +0000
+++ b/plugins/muc/members_only.lib.lua	Wed Dec 19 23:14:30 2018 +0000
@@ -104,7 +104,7 @@
 	if not event.affiliation and get_members_only(event.room) then
 		return false;
 	end
-end);
+end, 2);
 
 -- registration required for entering members-only room
 module:hook("muc-occupant-pre-join", function(event)
diff -r 7e21ffbf7ca5 -r 537f6a27bdb6 plugins/muc/muc.lib.lua
--- a/plugins/muc/muc.lib.lua	Wed Dec 19 16:54:25 2018 +0000
+++ b/plugins/muc/muc.lib.lua	Wed Dec 19 23:14:30 2018 +0000
@@ -61,7 +61,7 @@
 	elseif event.affiliation_rank >= valid_affiliations.none then
 		return "participant";
 	end
-end);
+end, -1);
 
 --- Occupant functions
 function room_mt:new_occupant(bare_real_jid, nick)