aboutsummaryrefslogtreecommitdiffstats
path: root/plugins/mod_roster.lua
diff options
context:
space:
mode:
authorKim Alvefur <zash@zash.se>2013-03-23 04:17:39 +0100
committerKim Alvefur <zash@zash.se>2013-03-23 04:17:39 +0100
commit2bde8103f5dba708e6e7a9b0773eba493bfefa7c (patch)
treefc52870bbca26966e739b1654dd7ff728fbbd9e0 /plugins/mod_roster.lua
parentbcd8f33f5be7555e0c7863b76e950bd9d156afe0 (diff)
parentaa0eb8fdc87589433a1cd5d03f136fb6f32a7426 (diff)
downloadprosody-2bde8103f5dba708e6e7a9b0773eba493bfefa7c.tar.gz
prosody-2bde8103f5dba708e6e7a9b0773eba493bfefa7c.zip
Merge 0.9->trunk
Diffstat (limited to 'plugins/mod_roster.lua')
-rw-r--r--plugins/mod_roster.lua1
1 files changed, 0 insertions, 1 deletions
diff --git a/plugins/mod_roster.lua b/plugins/mod_roster.lua
index 40d95be7..d530bb45 100644
--- a/plugins/mod_roster.lua
+++ b/plugins/mod_roster.lua
@@ -69,7 +69,6 @@ module:hook("iq/self/jabber:iq:roster:query", function(event)
and query.tags[1].attr.jid ~= "pending" then
local item = query.tags[1];
local from_node, from_host = jid_split(stanza.attr.from);
- local from_bare = from_node and (from_node.."@"..from_host) or from_host; -- bare JID
local jid = jid_prep(item.attr.jid);
local node, host, resource = jid_split(jid);
if not resource and host then