1
0
mirror of https://github.com/phpbb/phpbb.git synced 2025-08-13 12:14:06 +02:00

[ticket/11574] Fix various path issues in the updater

PHPBB3-11574
This commit is contained in:
Igor Wiedler
2013-07-13 16:47:15 -04:00
parent 51ab2c710e
commit d6de892ee4
3 changed files with 29 additions and 30 deletions

View File

@@ -121,8 +121,8 @@ $phpbb_class_loader = new phpbb_class_loader('phpbb_', "{$phpbb_root_path}includ
$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;
$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';
$container_extensions = array(
new phpbb_di_extension_config($phpbb_root_path . 'config.' . $phpEx),
@@ -130,7 +130,6 @@ $container_extensions = array(
);
$container_passes = array(
new phpbb_di_pass_collection_pass(),
//new phpbb_di_pass_kernel_pass(),
);
$phpbb_container = phpbb_create_container($container_extensions, $phpbb_root_path, $phpEx);