Merge 0.10->trunk

1 files changed, 3 insertions, 2 deletions

diff --git a/plugins/mod_presence.lua b/plugins/mod_presence.lua
index d4f2f28d..5e1eb404 100644
--- a/plugins/mod_presence.lua
+++ b/plugins/mod_presence.lua
@@ -364,18 +364,19 @@ module:hook("roster-item-removed", function (event)
 	local roster = event.roster or session and session.roster;
 	local jid = event.jid;
 	local item = event.item;
+	local from_jid = session.full_jid or (username .. "@" .. module.host);
 
 	local subscription = item and item.subscription or "none";
 	local ask = item and item.ask;
 	local pending = roster and roster[false].pending[jid];
 
 	if subscription == "both" or subscription == "from" or pending then
-		core_post_stanza(session, st.presence({type="unsubscribed", from=session.full_jid, to=jid}));
+		core_post_stanza(session, st.presence({type="unsubscribed", from=from_jid, to=jid}));
 	end
 
 	if subscription == "both" or subscription == "to" or ask then
 		send_presence_of_available_resources(username, module.host, jid, session, st.presence({type="unavailable"}));
-		core_post_stanza(session, st.presence({type="unsubscribe", from=session.full_jid, to=jid}));
+		core_post_stanza(session, st.presence({type="unsubscribe", from=from_jid, to=jid}));
 	end
 
 end, -1);