# HG changeset patch
# User Kim Alvefur <zash@zash.se>
# Date 1621184720 -7200
# Node ID c471e19a238e356db17f2b0c4cac80163708ee6f
# Parent  60e31c9ece57f17baebd1bb9390eae52f3d94e4a# Parent  6e67872bcba4f50167e909d487bedc8ce1ebd42c
Merge 0.11->trunk

diff -r 60e31c9ece57 -r c471e19a238e plugins/mod_pep.lua
--- a/plugins/mod_pep.lua	Sun May 16 16:52:59 2021 +0200
+++ b/plugins/mod_pep.lua	Sun May 16 19:05:20 2021 +0200
@@ -214,18 +214,6 @@
 
 		check_node_config = check_node_config;
 	});
-	local nodes, err = known_nodes:get(username);
-	if nodes then
-		module:log("debug", "Restoring nodes for user %s", username);
-		for node in pairs(nodes) do
-			module:log("debug", "Restoring node %q", node);
-			service:create(node, true);
-		end
-	elseif err then
-		module:log("error", "Could not restore nodes for %s: %s", username, err);
-	else
-		module:log("debug", "No known nodes");
-	end
 	services[username] = service;
 	module:add_item("pep-service", { service = service, jid = user_bare });
 	return service;
diff -r 60e31c9ece57 -r c471e19a238e util/pubsub.lua
--- a/util/pubsub.lua	Sun May 16 16:52:59 2021 +0200
+++ b/util/pubsub.lua	Sun May 16 19:05:20 2021 +0200
@@ -565,6 +565,10 @@
 		return nil, "invalid-item";
 	end
 	local node_data = self.data[node];
+	if not node_data then
+		-- FIXME how is this possible?  #1657
+		return nil, "internal-server-error";
+	end
 	local ok = node_data:set(id, item);
 	if not ok then
 		return nil, "internal-server-error";