diff options
author | Kim Alvefur <zash@zash.se> | 2013-05-26 16:02:01 +0200 |
---|---|---|
committer | Kim Alvefur <zash@zash.se> | 2013-05-26 16:02:01 +0200 |
commit | 3ec0f31581ee93e40f000e883ec0ad1a4e5b480c (patch) | |
tree | 035cdd418eff713bd33114630d1c6bdb5991fde1 | |
parent | 08466bf01179e9816d25ed8890f5af9cc8109928 (diff) | |
parent | d162fd9921ce280027b1d2466f2a1f1d330347a6 (diff) | |
download | prosody-3ec0f31581ee93e40f000e883ec0ad1a4e5b480c.tar.gz prosody-3ec0f31581ee93e40f000e883ec0ad1a4e5b480c.zip |
Merge 0.9->trunk
-rw-r--r-- | util/pubsub.lua | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/util/pubsub.lua b/util/pubsub.lua index e7fc86b1..1ecbdfa8 100644 --- a/util/pubsub.lua +++ b/util/pubsub.lua @@ -350,7 +350,7 @@ function service:get_subscriptions(node, actor, jid) if node then -- Return only subscriptions to this node if subscribed_nodes[node] then ret[#ret+1] = { - node = subscribed_nodes[node]; + node = node; jid = jid; subscription = node_obj.subscribers[jid]; }; |