diff options
| author | Oleg Pudeyev <oleg@bsdpower.com> | 2012-12-29 13:45:40 -0500 |
|---|---|---|
| committer | Oleg Pudeyev <oleg@bsdpower.com> | 2012-12-29 13:45:40 -0500 |
| commit | 4dcc8cabae670e0ee57a489e7e13c2f93d99753a (patch) | |
| tree | 79f36cb8cb6db68d5b93deec7999633e5047e4be /phpBB/includes/functions_install.php | |
| parent | f9354b98d88bb9c6e212a68de813f75508b7dafc (diff) | |
| parent | 61391f648c95251466f805f148f1656e940f2027 (diff) | |
| download | forums-4dcc8cabae670e0ee57a489e7e13c2f93d99753a.tar forums-4dcc8cabae670e0ee57a489e7e13c2f93d99753a.tar.gz forums-4dcc8cabae670e0ee57a489e7e13c2f93d99753a.tar.bz2 forums-4dcc8cabae670e0ee57a489e7e13c2f93d99753a.tar.xz forums-4dcc8cabae670e0ee57a489e7e13c2f93d99753a.zip | |
Merge PR #1130 branch 'EXreaction/ticket/11259' into develop
* EXreaction/ticket/11259:
[ticket/11259] htmlspecialchars($phpbb_admin_path)
[ticket/11259] adm_relative_path -> phpbb_adm_relative_path
[ticket/11259] Also make adm_relative_path available in the container
[ticket/11259] Make phpbb_admin_path available everywhere
Conflicts:
phpBB/install/index.php
phpBB/install/install_update.php
Diffstat (limited to 'phpBB/includes/functions_install.php')
| -rw-r--r-- | phpBB/includes/functions_install.php | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/phpBB/includes/functions_install.php b/phpBB/includes/functions_install.php index 2b4b7eb10d..edb2c35fee 100644 --- a/phpBB/includes/functions_install.php +++ b/phpBB/includes/functions_install.php @@ -508,6 +508,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', ); |