extern/egroupware
1
0
Fork 1
mirror of https://github.com/EGroupware/egroupware.git synced 2025-08-16 03:34:48 +02:00
Code Issues Packages Projects Releases Wiki Activity

using correct defaults eg. "template1" for postgres

Browse Source
This commit is contained in:
Ralf Becker
2016-08-06 10:35:48 +02:00
parent d1a959629b
commit 1fa85c88b1
2 changed files with 8 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
setup/inc/class.setup_cmd_database.inc.php
View File

@ -58,7 +58,7 @@ class setup_cmd_database extends setup_cmd
{
if (!is_array($domain))
{
$domain = array(
$data = array(
'domain' => $domain,
'db_type' => $db_type,
'db_host' => $db_host,
@ -73,8 +73,12 @@ class setup_cmd_database extends setup_cmd
'make_db_name_unique' => $make_db_name_unique,
);
}
//error_log(__METHOD__.'('.array2string($domain).") make_db_name_unique=".array2string($domain['make_db_name_unique']));
admin_cmd::__construct($domain);
else
{
$data = $domain;
}
// need to incorporate correct defaults for given database type
admin_cmd::__construct(array_merge(self::defaults($data['db_type']), array_diff($data, array(null))));
}
/**