From c74ec3e6198ab325d07f671f5a48f85ed148bf5e Mon Sep 17 00:00:00 2001 From: Marina Glancy Date: Thu, 16 Oct 2014 17:57:09 +0800 Subject: [PATCH] MDL-36987 auth_manual: fix config for field locking Thanks to Sergey for the patch --- auth/manual/auth.php | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/auth/manual/auth.php b/auth/manual/auth.php index 2803711cc0c..0b014bbedea 100644 --- a/auth/manual/auth.php +++ b/auth/manual/auth.php @@ -41,13 +41,16 @@ class auth_plugin_manual extends auth_plugin_base { * The name of the component. Used by the configuration. */ const COMPONENT_NAME = 'auth_manual'; + const LEGACY_COMPONENT_NAME = 'auth/manual'; /** * Constructor. */ function auth_plugin_manual() { $this->authtype = 'manual'; - $this->config = get_config(self::COMPONENT_NAME); + $config = get_config(self::COMPONENT_NAME); + $legacyconfig = get_config(self::LEGACY_COMPONENT_NAME); + $this->config = (object)array_merge((array)$legacyconfig, (array)$config); } /**