mod_privacy: Fix selecting the top resource (fixes #694)

[prosody.git] / plugins / mod_privacy.lua

diff --git a/plugins/mod_privacy.lua b/plugins/mod_privacy.lua
index 31ace9f9df126eb25ddaf66d40226bb1788ea28d..f95dfa50a1043588f1a4201177378d96b448aa41 100644 (file)
--- a/plugins/mod_privacy.lua
+++ b/plugins/mod_privacy.lua
@@ -157,7 +157,7 @@ function createOrReplaceList (privacy_lists, origin, stanza, name, entries)
                list.items[#list.items + 1] = tmp;
        end
        
-       table.sort(list, function(a, b) return a.order < b.order; end);
+       table.sort(list.items, function(a, b) return a.order < b.order; end);
 
        origin.send(st.reply(stanza));
        if bare_sessions[bare_jid] ~= nil then
@@ -397,7 +397,7 @@ function preCheckIncoming(e)
                        local prio = 0;
                        if bare_sessions[node.."@"..host] ~= nil then
                                for resource, session_ in pairs(bare_sessions[node.."@"..host].sessions) do
-                                       if session_.priority ~= nil and session_.priority > prio then
+                                       if session_.priority ~= nil and session_.priority >= prio then
                                                session = session_;
                                                prio = session_.priority;
                                        end