Merge 0.11->trunk

3 files changed, 10 insertions, 1 deletions

diff --git a/plugins/mod_register.lua b/plugins/mod_register.lua
index 49ff8a38..763e2fd9 100644
--- a/plugins/mod_register.lua
+++ b/plugins/mod_register.lua
@@ -11,7 +11,6 @@ local allow_registration = module:get_option_boolean("allow_registration", false
 
 if allow_registration then
 	module:depends("register_ibr");
-	module:depends("register_limits");
 end
 
 module:depends("user_account_management");
diff --git a/plugins/mod_register_ibr.lua b/plugins/mod_register_ibr.lua
index abfc1079..bbe7581d 100644
--- a/plugins/mod_register_ibr.lua
+++ b/plugins/mod_register_ibr.lua
@@ -18,6 +18,10 @@ local additional_fields = module:get_option("additional_registration_fields", {}
 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 --git a/plugins/mod_storage_memory.lua b/plugins/mod_storage_memory.lua
index 9659f9e7..ed04a5fb 100644
--- a/plugins/mod_storage_memory.lua
+++ b/plugins/mod_storage_memory.lua
@@ -197,6 +197,12 @@ function driver:open(store, typ) -- luacheck: ignore 212/self
 	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;