Merge 0.9->trunk
authorKim Alvefur <zash@zash.se>
Sun, 26 May 2013 16:02:01 +0200
changeset 5629 2427c81da16c
parent 5627 0439d1349dc1 (current diff)
parent 5628 ba5c2f6b799e (diff)
child 5631 78bc91f0d74b
Merge 0.9->trunk
--- a/util/pubsub.lua	Fri May 17 18:35:50 2013 +0200
+++ b/util/pubsub.lua	Sun May 26 16:02:01 2013 +0200
@@ -350,7 +350,7 @@
 			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];
 					};