From 336f7667f8c677c9d1222c993e3f99bff0180772 Mon Sep 17 00:00:00 2001 From: Kim Alvefur Date: Sun, 5 Apr 2015 16:19:02 +0200 Subject: rostermanager: Fix roster upgrade code (thanks mva) --- core/rostermanager.lua | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) (limited to 'core/rostermanager.lua') diff --git a/core/rostermanager.lua b/core/rostermanager.lua index b39e5323..612a349f 100644 --- a/core/rostermanager.lua +++ b/core/rostermanager.lua @@ -86,12 +86,11 @@ local function roster_metadata(roster, err) metadata = { broken = err or nil }; roster[false] = metadata; end - if not metadata.pending then - if roster.pending and not type(roster.pending.subscription) == "string" then - metadata.pending, roster.pending = roster.pending, nil; - else - metadata.pending = {}; - end + if roster.pending and type(roster.pending.subscription) ~= "string" then + metadata.pending = roster.pending; + roster.pending = nil; + elseif not metadata.pending then + metadata.pending = {}; end return metadata; end -- cgit v1.2.3