From 5973d330fd29307128483fda19c6c8fb5b983689 Mon Sep 17 00:00:00 2001 From: Ralf Becker Date: Sat, 15 May 2010 07:56:58 +0000 Subject: [PATCH] setup->setup_account_object() need to load config to $GLOBALS[egw_info][server] too, as eg. auth::encyrpt_password needs the encryption type --- setup/inc/class.setup.inc.php | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/setup/inc/class.setup.inc.php b/setup/inc/class.setup.inc.php index 1fe7549d99..adbb41c5d8 100644 --- a/setup/inc/class.setup.inc.php +++ b/setup/inc/class.setup.inc.php @@ -197,10 +197,10 @@ class setup } setcookie($cookiename,$cookievalue,$cookietime,'/',$this->cookie_domain); } - + /** * Get configuration language from $_POST or $_COOKIE and validate it - * + * * @return string */ static function get_lang() @@ -998,7 +998,7 @@ class setup while(($row = $this->db->row(true))) { - $config[$row['config_name']] = $row['config_value']; + $GLOBALS['egw_info']['server'][$row['config_name']] = $config[$row['config_name']] = $row['config_value']; } } $this->accounts = new accounts($config);