diff options
| author | Igor Wiedler <igor@wiedler.ch> | 2013-07-14 01:28:49 -0400 |
|---|---|---|
| committer | Igor Wiedler <igor@wiedler.ch> | 2013-07-14 01:29:49 -0400 |
| commit | e6e2a50062eca8b640822b8f616ea4bb23b23566 (patch) | |
| tree | b3576fc17448f058122d52a9540e0d54beaac4f9 /phpBB | |
| parent | c96f8936c969b3fd441c179cc4ffa8ea75d8f901 (diff) | |
| download | forums-e6e2a50062eca8b640822b8f616ea4bb23b23566.tar forums-e6e2a50062eca8b640822b8f616ea4bb23b23566.tar.gz forums-e6e2a50062eca8b640822b8f616ea4bb23b23566.tar.bz2 forums-e6e2a50062eca8b640822b8f616ea4bb23b23566.tar.xz forums-e6e2a50062eca8b640822b8f616ea4bb23b23566.zip | |
[ticket/11574] Add trailing slash for consistency
PHPBB3-11574
Diffstat (limited to 'phpBB')
| -rw-r--r-- | phpBB/includes/functions_container.php | 2 | ||||
| -rw-r--r-- | phpBB/install/database_update.php | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/phpBB/includes/functions_container.php b/phpBB/includes/functions_container.php index 923a8f370b..e22fa9919a 100644 --- a/phpBB/includes/functions_container.php +++ b/phpBB/includes/functions_container.php @@ -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) { $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); $container = phpbb_create_container(array($core), $phpbb_root_path, $php_ext); diff --git a/phpBB/install/database_update.php b/phpBB/install/database_update.php index 5f2d46c7ad..e0ecc242e1 100644 --- a/phpBB/install/database_update.php +++ b/phpBB/install/database_update.php @@ -123,7 +123,7 @@ $phpbb_class_loader->register(); // Set up container (must be done here because extensions table may not exist) $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( new phpbb_di_extension_config($phpbb_root_path . 'config.' . $phpEx), |