mirror of
https://github.com/phpbb/phpbb.git
synced 2025-05-06 07:35:29 +02:00
[ticket/11574] Add trailing slash for consistency
PHPBB3-11574
This commit is contained in:
parent
c96f8936c9
commit
e6e2a50062
@ -54,7 +54,7 @@ function phpbb_create_container(array $extensions, $phpbb_root_path, $php_ext)
|
|||||||
function phpbb_create_install_container($phpbb_root_path, $php_ext)
|
function phpbb_create_install_container($phpbb_root_path, $php_ext)
|
||||||
{
|
{
|
||||||
$other_config_path = $phpbb_root_path . 'install/update/new/config/';
|
$other_config_path = $phpbb_root_path . 'install/update/new/config/';
|
||||||
$config_path = file_exists($other_config_path . 'services.yml') ? $other_config_path : $phpbb_root_path . 'config';
|
$config_path = file_exists($other_config_path . 'services.yml') ? $other_config_path : $phpbb_root_path . 'config/';
|
||||||
|
|
||||||
$core = new phpbb_di_extension_core($config_path);
|
$core = new phpbb_di_extension_core($config_path);
|
||||||
$container = phpbb_create_container(array($core), $phpbb_root_path, $php_ext);
|
$container = phpbb_create_container(array($core), $phpbb_root_path, $php_ext);
|
||||||
|
@ -123,7 +123,7 @@ $phpbb_class_loader->register();
|
|||||||
|
|
||||||
// Set up container (must be done here because extensions table may not exist)
|
// Set up container (must be done here because extensions table may not exist)
|
||||||
$other_config_path = $phpbb_root_path . 'install/update/new/config/';
|
$other_config_path = $phpbb_root_path . 'install/update/new/config/';
|
||||||
$config_path = file_exists($other_config_path . 'services.yml') ? $other_config_path : $phpbb_root_path . 'config';
|
$config_path = file_exists($other_config_path . 'services.yml') ? $other_config_path : $phpbb_root_path . 'config/';
|
||||||
|
|
||||||
$container_extensions = array(
|
$container_extensions = array(
|
||||||
new phpbb_di_extension_config($phpbb_root_path . 'config.' . $phpEx),
|
new phpbb_di_extension_config($phpbb_root_path . 'config.' . $phpEx),
|
||||||
|
Loading…
x
Reference in New Issue
Block a user