# HG changeset patch
# User Kim Alvefur <zash@zash.se>
# Date 1514577007 -3600
# Node ID b703f56b8194295d8aadfde5285022b93480a9b4
# Parent  c494e12ce81f8edde6dc8ccf110d9f0628ddbf76# Parent  9b81c22d5b542a1b8e2ae148c1ead628c44a1702
Merge 0.10->trunk

diff -r c494e12ce81f -r b703f56b8194 core/rostermanager.lua
--- a/core/rostermanager.lua	Thu Dec 28 22:21:32 2017 +0100
+++ b/core/rostermanager.lua	Fri Dec 29 20:50:07 2017 +0100
@@ -112,7 +112,15 @@
 	local data, err = roster_store:get(username);
 	roster = data or {};
 	if user then user.roster = roster; end
+	local legacy_pending = roster.pending and type(roster.pending.subscription) ~= "string";
 	roster_metadata(roster, err);
+	if legacy_pending then
+		-- Due to map store use, we need to manually delete this entry
+		log("debug", "Removing legacy 'pending' entry");
+		if not save_roster(username, host, roster, "pending") then
+			log("warn", "Could not remove legacy 'pendig' entry");
+		end
+	end
 	if roster[jid] then
 		roster[jid] = nil;
 		log("debug", "Roster for %s had a self-contact, removing", jid);