extern/egroupware_official
1
0
Fork 0
mirror of https://github.com/EGroupware/egroupware.git synced 2024-12-24 15:48:55 +01:00
Code Issues Packages Projects Releases Wiki Activity

improved handling of schema-files on system startup or in setup

Browse Source
This commit is contained in:
Ralf Becker 2004-08-04 15:33:42 +00:00
parent 906dd66691
commit 5d5730d813
1 changed files with 10 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
phpgwapi/inc/class.db.inc.php
View File

@ -1005,6 +1005,10 @@
*/ */
function column_data_implode($glue,$array,$use_key=True,$only=False,$column_definitions=False) function column_data_implode($glue,$array,$use_key=True,$only=False,$column_definitions=False)
{ {
if (!is_array($array)) // this allows to give an SQL-string for delete or update
{
return $array;
}
if (!$column_definitions) if (!$column_definitions)
{ {
$column_definitions = $this->column_definitions; $column_definitions = $this->column_definitions;
@ -1080,24 +1084,24 @@
} }
if (isset($GLOBALS['phpgw_info']['apps'])) // this happens during the eGW startup, dont set it then !!! if (isset($GLOBALS['phpgw_info']['apps'])) // this happens during the eGW startup, dont set it then !!!
{ {
$app_data = &$GLOBALS['phpgw_info']['apps'][$app]; $this->app_data = &$GLOBALS['phpgw_info']['apps'][$app];
} }
if (!isset($app_data['table_defs'])) if (!isset($this->app_data['table_defs']))
{ {
$tables_current = PHPGW_INCLUDE_ROOT . "/$app/setup/tables_current.inc.php"; $tables_current = PHPGW_INCLUDE_ROOT . "/$app/setup/tables_current.inc.php";
if (!@file_exists($tables_current)) if (!@file_exists($tables_current))
{ {
return $app_data['table_defs'] = False; return $this->app_data['table_defs'] = False;
} }
include($tables_current); include($tables_current);
$app_data['table_defs'] = $phpgw_baseline; $this->app_data['table_defs'] = &$phpgw_baseline;
} }
if ($table && (!$app_data['table_defs'] || !isset($app_data['table_defs'][$table]))) if ($table && (!$this->app_data['table_defs'] || !isset($this->app_data['table_defs'][$table])))
{ {
return False; return False;
} }
return $table ? $app_data['table_defs'][$table] : $app_data['table_defs']; return $table ? $this->app_data['table_defs'][$table] : $this->app_data['table_defs'];
} }
/** /**