aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMatthew Wild <mwild1@gmail.com>2013-05-10 10:48:07 +0100
committerMatthew Wild <mwild1@gmail.com>2013-05-10 10:48:07 +0100
commit33a4ee4b14e8ba0b22d038e06ed1daa695ce3648 (patch)
tree6ebabe3b7fdbc85dfee6bae922ecc2bf73f919fe
parentc3ea781f9f47946b386f1f4e3e1f872adf8f863f (diff)
parentfc293d102131bc1b7ca985c76f04ae4ace114401 (diff)
downloadprosody-33a4ee4b14e8ba0b22d038e06ed1daa695ce3648.tar.gz
prosody-33a4ee4b14e8ba0b22d038e06ed1daa695ce3648.zip
Merge 0.9->trunk
-rw-r--r--plugins/mod_pubsub.lua3
1 files changed, 0 insertions, 3 deletions
diff --git a/plugins/mod_pubsub.lua b/plugins/mod_pubsub.lua
index 22969ab5..926ed4f2 100644
--- a/plugins/mod_pubsub.lua
+++ b/plugins/mod_pubsub.lua
@@ -80,9 +80,6 @@ end
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));