diff options
| author | Marc Alexander <admin@m-a-styles.de> | 2013-01-04 10:49:57 +0100 |
|---|---|---|
| committer | Marc Alexander <admin@m-a-styles.de> | 2013-01-04 10:49:57 +0100 |
| commit | 5d091e2d8f5079a8ce8dc14500c29f6642c40e98 (patch) | |
| tree | f4c73527be7e6f5e783351edc306e929a8946b31 /phpBB/includes/functions_install.php | |
| parent | 4a8b1a6e050bba7f8f73f689bbca4185ab27cf8c (diff) | |
| parent | 228580b6743b9650996284dd04a3f5de6c2447ca (diff) | |
| download | forums-5d091e2d8f5079a8ce8dc14500c29f6642c40e98.tar forums-5d091e2d8f5079a8ce8dc14500c29f6642c40e98.tar.gz forums-5d091e2d8f5079a8ce8dc14500c29f6642c40e98.tar.bz2 forums-5d091e2d8f5079a8ce8dc14500c29f6642c40e98.tar.xz forums-5d091e2d8f5079a8ce8dc14500c29f6642c40e98.zip | |
Merge branch 'develop' of https://github.com/phpbb/phpbb3 into feature/avatars
Conflicts:
phpBB/includes/ucp/ucp_groups.php
Diffstat (limited to 'phpBB/includes/functions_install.php')
| -rw-r--r-- | phpBB/includes/functions_install.php | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/phpBB/includes/functions_install.php b/phpBB/includes/functions_install.php index 2b4b7eb10d..8978e3fadd 100644 --- a/phpBB/includes/functions_install.php +++ b/phpBB/includes/functions_install.php @@ -32,6 +32,8 @@ function get_available_dbms($dbms = false, $return_unavailable = false, $only_20 'AVAILABLE' => true, '2.0.x' => false, ), + // Note: php 5.5 alpha 2 deprecated mysql. + // Keep mysqli before mysql in this list. 'mysqli' => array( 'LABEL' => 'MySQL with MySQLi Extension', 'SCHEMA' => 'mysql_41', @@ -508,6 +510,9 @@ function phpbb_create_config_file_data($data, $dbms, $debug = false, $debug_test 'dbuser' => $data['dbuser'], 'dbpasswd' => htmlspecialchars_decode($data['dbpasswd']), 'table_prefix' => $data['table_prefix'], + + 'adm_relative_path' => 'adm/', + 'acm_type' => 'phpbb_cache_driver_file', ); |