# HG changeset patch
# User Kim Alvefur <zash@zash.se>
# Date 1541624020 -3600
# Node ID ca000dcd4c06ae7524a00fd4fd1ab229edf66ac0
# Parent  2a42b72468ca88c23afddc04d0fda21840f2ea5e# Parent  1dfcea523200447b0e8a4fa67cb83274ea06c763
Merge 0.11->trunk

diff -r 2a42b72468ca -r ca000dcd4c06 plugins/mod_register.lua
--- a/plugins/mod_register.lua	Thu Nov 01 23:58:41 2018 +0100
+++ b/plugins/mod_register.lua	Wed Nov 07 21:53:40 2018 +0100
@@ -11,7 +11,6 @@
 
 if allow_registration then
 	module:depends("register_ibr");
-	module:depends("register_limits");
 end
 
 module:depends("user_account_management");
diff -r 2a42b72468ca -r ca000dcd4c06 plugins/mod_register_ibr.lua
--- a/plugins/mod_register_ibr.lua	Thu Nov 01 23:58:41 2018 +0100
+++ b/plugins/mod_register_ibr.lua	Wed Nov 07 21:53:40 2018 +0100
@@ -18,6 +18,10 @@
 local require_encryption = module:get_option_boolean("c2s_require_encryption",
 	module:get_option_boolean("require_encryption", false));
 
+pcall(function ()
+	module:depends("register_limits");
+end);
+
 local account_details = module:open_store("account_details");
 
 local field_map = {
diff -r 2a42b72468ca -r ca000dcd4c06 plugins/mod_storage_memory.lua
--- a/plugins/mod_storage_memory.lua	Thu Nov 01 23:58:41 2018 +0100
+++ b/plugins/mod_storage_memory.lua	Wed Nov 07 21:53:40 2018 +0100
@@ -197,6 +197,12 @@
 	return nil, "unsupported-store";
 end
 
+function driver:purge(user) -- luacheck: ignore 212/self
+	for _, store in pairs(memory) do
+		store[user] = nil;
+	end
+end
+
 if auto_purge_enabled then
 	module:hook("resource-unbind", function (event)
 		local user_bare_jid = event.session.username.."@"..event.session.host;