diff options
| author | Kim Alvefur <zash@zash.se> | 2016-10-18 19:07:55 +0200 |
|---|---|---|
| committer | Kim Alvefur <zash@zash.se> | 2016-10-18 19:07:55 +0200 |
| commit | 0b21ca653d69a7b53f75c576b5902d8684c32e61 (patch) | |
| tree | a7bd7a664b80ac2d321bef9ef2e7a465e32982a5 /util/pubsub.lua | |
| parent | 98be2f263bd887a0f0f53a405f9d8f42d270a176 (diff) | |
| parent | de5e008d57702c1aeb196a718c045b0517ba631f (diff) | |
| download | prosody-0b21ca653d69a7b53f75c576b5902d8684c32e61.tar.gz prosody-0b21ca653d69a7b53f75c576b5902d8684c32e61.zip | |
Merge 0.10->trunk
Diffstat (limited to 'util/pubsub.lua')
| -rw-r--r-- | util/pubsub.lua | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/util/pubsub.lua b/util/pubsub.lua index 520d80a7..e96df5fc 100644 --- a/util/pubsub.lua +++ b/util/pubsub.lua @@ -371,13 +371,13 @@ function service:get_subscriptions(node, actor, jid) -- a get_subscription() call for each node. local ret = {}; if subs then - for jid, subscribed_nodes in pairs(subs) do + for subscribed_jid, subscribed_nodes in pairs(subs) do if node then -- Return only subscriptions to this node if subscribed_nodes[node] then ret[#ret+1] = { node = node; - jid = jid; - subscription = node_obj.subscribers[jid]; + jid = subscribed_jid; + subscription = node_obj.subscribers[subscribed_jid]; }; end else -- Return subscriptions to all nodes @@ -385,8 +385,8 @@ function service:get_subscriptions(node, actor, jid) for subscribed_node in pairs(subscribed_nodes) do ret[#ret+1] = { node = subscribed_node; - jid = jid; - subscription = nodes[subscribed_node].subscribers[jid]; + jid = subscribed_jid; + subscription = nodes[subscribed_node].subscribers[subscribed_jid]; }; end end |