# HG changeset patch
# User Kim Alvefur <zash@zash.se>
# Date 1428243850 -7200
# Node ID bae327ea487af417254f2bd832275fd0dd1ead0b
# Parent  0da3e10b3333e1cd9320084a1fdfa04dea138be2# Parent  7f9b49f2758a0359fdd459a9506692aca2f5a8be
Merge 0.10->trunk

diff -r 0da3e10b3333 -r bae327ea487a core/rostermanager.lua
--- a/core/rostermanager.lua	Sun Apr 05 15:22:33 2015 +0200
+++ b/core/rostermanager.lua	Sun Apr 05 16:24:10 2015 +0200
@@ -86,12 +86,11 @@
 		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