# HG changeset patch
# User Matthew Wild <mwild1@gmail.com>
# Date 1368179287 -3600
# Node ID f592409f5fcd9fa3606c7af1ab45964544e42f06
# Parent  c463558bed45aef9facab0e61f941026232b4b37# Parent  c45997aebaa28f199186d991986cbb49278fc81f
Merge 0.9->trunk

diff -r c463558bed45 -r f592409f5fcd plugins/mod_pubsub.lua
--- 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));