aboutsummaryrefslogtreecommitdiffstats
path: root/plugins
diff options
context:
space:
mode:
authorMatthew Wild <mwild1@gmail.com>2008-10-08 17:27:20 +0100
committerMatthew Wild <mwild1@gmail.com>2008-10-08 17:27:20 +0100
commit584b40a6825647ae2388ba47247689e8994c2129 (patch)
tree77a86a2fb4ee9e93acfbbbe81537eefb57a01144 /plugins
parent37890122d6cd3b5ad419560b06bad2b69b9a5577 (diff)
parent0af37d5e1ed0b11e90e63ff232557dc890504a6f (diff)
downloadprosody-584b40a6825647ae2388ba47247689e8994c2129.tar.gz
prosody-584b40a6825647ae2388ba47247689e8994c2129.zip
Merge roster fixes from waqas
Diffstat (limited to 'plugins')
-rw-r--r--plugins/mod_roster.lua8
1 files changed, 0 insertions, 8 deletions
diff --git a/plugins/mod_roster.lua b/plugins/mod_roster.lua
index 8b4a3a0a..962c6c70 100644
--- a/plugins/mod_roster.lua
+++ b/plugins/mod_roster.lua
@@ -5,14 +5,6 @@ local send = require "core.sessionmanager".send_to_session
add_iq_handler("c2s", "jabber:iq:roster",
function (session, stanza)
if stanza.attr.type == "get" then
- session.roster = session.roster or rostermanager.getroster(session.username, session.host);
- if session.roster == false then
- send(session, st.reply(stanza)
- :tag("error", { type = "wait" })
- :tag("internal-server-error", { xmlns = "urn:ietf:params:xml:ns:xmpp-stanzas"}));
- return true;
- else session.roster = session.roster or {};
- end
local roster = st.reply(stanza)
:query("jabber:iq:roster");
for jid in pairs(session.roster) do