Merge 0.9->trunk
authorMatthew Wild <mwild1@gmail.com>
Fri, 10 May 2013 10:48:07 +0100
changeset 5570 f592409f5fcd
parent 5568 c463558bed45 (current diff)
parent 5569 c45997aebaa2 (diff)
child 5572 19e1f9881bfc
child 5574 40fe8bd35eaa
Merge 0.9->trunk
--- a/plugins/mod_pubsub.lua	Fri May 10 10:46:27 2013 +0100
+++ b/plugins/mod_pubsub.lua	Fri May 10 10:48:07 2013 +0100
@@ -80,9 +80,6 @@
 
 function handlers.get_subscriptions(origin, stanza, subscriptions)
 	local node = subscriptions.attr.node;
-	if not node then
-		return origin.send(pubsub_error_reply(stanza, "nodeid-required"));
-	end
 	local ok, ret = service:get_subscriptions(node, stanza.attr.from, stanza.attr.from);
 	if not ok then
 		return origin.send(pubsub_error_reply(stanza, ret));