diff options
| author | Igor Wiedler <igor@wiedler.ch> | 2013-07-13 16:47:15 -0400 |
|---|---|---|
| committer | Igor Wiedler <igor@wiedler.ch> | 2013-07-14 01:06:10 -0400 |
| commit | d6de892ee40579c45259f8c68ba7eef26accc08b (patch) | |
| tree | 463f703896214b6dbc108cffc8aeef186604bb4f /phpBB/install/database_update.php | |
| parent | 51ab2c710e91d98bb182dded1e9d5462451151e8 (diff) | |
| download | forums-d6de892ee40579c45259f8c68ba7eef26accc08b.tar forums-d6de892ee40579c45259f8c68ba7eef26accc08b.tar.gz forums-d6de892ee40579c45259f8c68ba7eef26accc08b.tar.bz2 forums-d6de892ee40579c45259f8c68ba7eef26accc08b.tar.xz forums-d6de892ee40579c45259f8c68ba7eef26accc08b.zip | |
[ticket/11574] Fix various path issues in the updater
PHPBB3-11574
Diffstat (limited to 'phpBB/install/database_update.php')
| -rw-r--r-- | phpBB/install/database_update.php | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/phpBB/install/database_update.php b/phpBB/install/database_update.php index b0e28958ac..51ffdd3c88 100644 --- a/phpBB/install/database_update.php +++ b/phpBB/install/database_update.php @@ -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); |