# HG changeset patch
# User Kim Alvefur <zash@zash.se>
# Date 1460130890 -7200
# Node ID a8ca12e7c2fb3f8855e081ce8918732d51666386
# Parent  795a95258292a08865783a76068776a8317f0949# Parent  0c69305ab525096c23efb17a02ef377f15385217
Merge 0.10->trunk

diff -r 795a95258292 -r a8ca12e7c2fb plugins/mod_presence.lua
--- a/plugins/mod_presence.lua	Fri Apr 08 17:54:46 2016 +0200
+++ b/plugins/mod_presence.lua	Fri Apr 08 17:54:50 2016 +0200
@@ -364,18 +364,19 @@
 	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);