aboutsummaryrefslogtreecommitdiffstats
path: root/core
diff options
context:
space:
mode:
authorMatthew Wild <mwild1@gmail.com>2008-10-24 15:20:34 +0100
committerMatthew Wild <mwild1@gmail.com>2008-10-24 15:20:34 +0100
commitccbb4246ed6c3b136b8e9f38724576dd24f7d23a (patch)
tree8e84ef5e586b2be6f817b6c739ea9f9dc6a2217f /core
parentd45f82770ffe798ed725084095c5dd66aa164248 (diff)
downloadprosody-ccbb4246ed6c3b136b8e9f38724576dd24f7d23a.tar.gz
prosody-ccbb4246ed6c3b136b8e9f38724576dd24f7d23a.zip
Fix nil concat for good this time (\!)
Diffstat (limited to 'core')
-rw-r--r--core/stanza_router.lua4
1 files changed, 2 insertions, 2 deletions
diff --git a/core/stanza_router.lua b/core/stanza_router.lua
index 599e7882..73924d9c 100644
--- a/core/stanza_router.lua
+++ b/core/stanza_router.lua
@@ -198,7 +198,7 @@ function core_route_stanza(origin, stanza)
end
end
else
- send(origin, st.presence({from=user.."@"..host, to=stanza.attr.from, type="unsubscribed"}));
+ send(origin, st.presence({from=user.."@"..host, to=origin.username.."@"..origin.host, type="unsubscribed"}));
end
elseif stanza.attr.type == "subscribe" then
-- TODO
@@ -252,7 +252,7 @@ function core_route_stanza(origin, stanza)
-- TODO we would get here for nodeless JIDs too. Do something fun maybe? Echo service? Let plugins use xmpp:server/resource addresses?
if stanza.name == "presence" then
if stanza.attr.type == "probe" then
- send(origin, st.presence({from = node.."@"..host, to = origin.username.."@"..origin.host, type = "unsubscribed"}));
+ send(origin, st.presence({from = stanza.attr.to, to = stanza.attr.from, type = "unsubscribed"}));
end
-- else ignore
else