From 78880b523856cf4ab088ddd601f6f87dcc389123 Mon Sep 17 00:00:00 2001 From: Ralf Becker Date: Thu, 9 Mar 2017 20:13:54 +0100 Subject: [PATCH] missing commit for readonly db stuff --- api/src/loader.php | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) diff --git a/api/src/loader.php b/api/src/loader.php index 861801422a..acf9849c45 100644 --- a/api/src/loader.php +++ b/api/src/loader.php @@ -112,12 +112,7 @@ $GLOBALS['egw_info']['user']['domain'] = Session::search_instance( Session::get_request('domain'),$GLOBALS['egw_info']['server']['default_domain'], array($_SERVER['HTTP_HOST'], $_SERVER['SERVER_NAME']),$GLOBALS['egw_domain']); -$GLOBALS['egw_info']['server']['db_host'] = $GLOBALS['egw_domain'][$GLOBALS['egw_info']['user']['domain']]['db_host']; -$GLOBALS['egw_info']['server']['db_port'] = $GLOBALS['egw_domain'][$GLOBALS['egw_info']['user']['domain']]['db_port']; -$GLOBALS['egw_info']['server']['db_name'] = $GLOBALS['egw_domain'][$GLOBALS['egw_info']['user']['domain']]['db_name']; -$GLOBALS['egw_info']['server']['db_user'] = $GLOBALS['egw_domain'][$GLOBALS['egw_info']['user']['domain']]['db_user']; -$GLOBALS['egw_info']['server']['db_pass'] = $GLOBALS['egw_domain'][$GLOBALS['egw_info']['user']['domain']]['db_pass']; -$GLOBALS['egw_info']['server']['db_type'] = $GLOBALS['egw_domain'][$GLOBALS['egw_info']['user']['domain']]['db_type']; +$GLOBALS['egw_info']['server'] += $GLOBALS['egw_domain'][$GLOBALS['egw_info']['user']['domain']]; // the egw-object instanciates all sub-classes (eg. $GLOBALS['egw']->db) and the egw_info array $GLOBALS['egw'] = new Egw(array_keys($GLOBALS['egw_domain']));