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 | cc88321c964ed69fcd619af590b0faf28dd093ab (patch) | |
| tree | 035cdd418eff713bd33114630d1c6bdb5991fde1 | |
| parent | 421bdc43997ee9215ce57ee73616f90ce695f601 (diff) | |
| parent | 4a8d033ca18c843418066d7b1d3f0a7a1fc00f42 (diff) | |
| download | prosody-cc88321c964ed69fcd619af590b0faf28dd093ab.tar.gz prosody-cc88321c964ed69fcd619af590b0faf28dd093ab.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]; }; |