prosody-hg: util/pubsub.lua comparison

Merge 0.10->trunk

comparison

equal deleted inserted replaced

-:bd854e762875
+:5022e6181193
 	local subs = self.subscriptions[normal_jid];
 	-- We return the subscription object from the node to save
 	-- 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;
+						jid = subscribed_jid;
-						subscription = node_obj.subscribers[jid];
+						subscription = node_obj.subscribers[subscribed_jid];
 					};
 				end
 			else -- Return subscriptions to all nodes
 				local nodes = self.nodes;
 				for subscribed_node in pairs(subscribed_nodes) do
 					ret[#ret+1] = {
 						node = subscribed_node;
-						jid = jid;
+						jid = subscribed_jid;
-						subscription = nodes[subscribed_node].subscribers[jid];
+						subscription = nodes[subscribed_node].subscribers[subscribed_jid];
 					};
 				end
 			end
 		end
 	end

Mercurial > prosody-hg