extern/egroupware_official
1
0
Fork 0
mirror of https://github.com/EGroupware/egroupware.git synced 2024-12-25 08:09:02 +01: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 b5d9515e63
commit 0e8cc03032
2 changed files with 9 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
.travis.yml
View File

@ -57,10 +57,8 @@ before_script:
;; ;;
esac esac
- phpenv config-rm xdebug.ini - phpenv config-rm xdebug.ini
- php -m #- php -m
- php -r 'var_dump(extension_loaded("pgsql"));' - curl https://svn.stylite.de/fix_mrconfig 2>/dev/null | php
- php -r 'var_dump(get_loaded_extensions());'
#- composer update --prefer-source $LOWEST_DEPS
- mr --trust-all --stats up - mr --trust-all --stats up
- (cd activesync; mr --trust-all --stats up) - (cd activesync; mr --trust-all --stats up)
# installing phpunit in version suitable for used PHP version # installing phpunit in version suitable for used PHP version

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)) if (!is_array($domain))
{ {
$domain = array( $data = array(
'domain' => $domain, 'domain' => $domain,
'db_type' => $db_type, 'db_type' => $db_type,
'db_host' => $db_host, 'db_host' => $db_host,
@ -73,8 +73,12 @@ class setup_cmd_database extends setup_cmd
'make_db_name_unique' => $make_db_name_unique, 'make_db_name_unique' => $make_db_name_unique,
); );
} }
//error_log(__METHOD__.'('.array2string($domain).") make_db_name_unique=".array2string($domain['make_db_name_unique'])); else
admin_cmd::__construct($domain); {
$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))));
} }
/** /**