From b2aa061bd98c42028115cbd6f7483bc737f4750b Mon Sep 17 00:00:00 2001 From: Ralf Becker Date: Fri, 15 Apr 2005 14:20:14 +0000 Subject: [PATCH] fixed not working charset conversation in setup --- phpgwapi/inc/class.db.inc.php | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/phpgwapi/inc/class.db.inc.php b/phpgwapi/inc/class.db.inc.php index e7318052ca..58ee587280 100644 --- a/phpgwapi/inc/class.db.inc.php +++ b/phpgwapi/inc/class.db.inc.php @@ -1074,14 +1074,18 @@ { $app = $this->app ? $this->app : $GLOBALS['phpgw_info']['flags']['currentapp']; } - if (isset($GLOBALS['phpgw_info']['apps'])) // this happens during the eGW startup, dont set it then !!! + if (isset($GLOBALS['phpgw_info']['apps'])) // dont set it, if it does not exist!!! { $this->app_data = &$GLOBALS['phpgw_info']['apps'][$app]; } + // this happens during the eGW startup or in setup + else + { + $this->app_data =& $this->all_app_data[$app]; + } if (!isset($this->app_data['table_defs'])) { $tables_current = PHPGW_INCLUDE_ROOT . "/$app/setup/tables_current.inc.php"; - if (!@file_exists($tables_current)) { return $this->app_data['table_defs'] = False;