diff options
| author | Joas Schilling <nickvergessen@gmx.de> | 2013-07-14 08:20:14 -0700 |
|---|---|---|
| committer | Joas Schilling <nickvergessen@gmx.de> | 2013-07-14 08:20:14 -0700 |
| commit | fa3cdb6bf2cfdca9c26168bd258752718bc8a43f (patch) | |
| tree | b3576fc17448f058122d52a9540e0d54beaac4f9 /phpBB/install/database_update.php | |
| parent | 51ab2c710e91d98bb182dded1e9d5462451151e8 (diff) | |
| parent | e6e2a50062eca8b640822b8f616ea4bb23b23566 (diff) | |
| download | forums-fa3cdb6bf2cfdca9c26168bd258752718bc8a43f.tar forums-fa3cdb6bf2cfdca9c26168bd258752718bc8a43f.tar.gz forums-fa3cdb6bf2cfdca9c26168bd258752718bc8a43f.tar.bz2 forums-fa3cdb6bf2cfdca9c26168bd258752718bc8a43f.tar.xz forums-fa3cdb6bf2cfdca9c26168bd258752718bc8a43f.zip | |
Merge pull request #7 from igorw/ticket/11574
[ticket/11574] Fix various path issues in the updater
Diffstat (limited to 'phpBB/install/database_update.php')
| -rw-r--r-- | phpBB/install/database_update.php | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/phpBB/install/database_update.php b/phpBB/install/database_update.php index b0e28958ac..e0ecc242e1 100644 --- a/phpBB/install/database_update.php +++ b/phpBB/install/database_update.php @@ -25,7 +25,7 @@ if (!function_exists('phpbb_require_updated')) { function phpbb_require_updated($path, $optional = false) { - global $phpbb_root_path; + global $phpbb_root_path, $table_prefix; $new_path = $phpbb_root_path . 'install/update/new/' . $path; $old_path = $phpbb_root_path . $path; @@ -108,6 +108,7 @@ phpbb_require_updated('includes/functions.' . $phpEx); phpbb_require_updated('includes/functions_content.' . $phpEx); phpbb_require_updated('includes/functions_container.' . $phpEx); +require($phpbb_root_path . 'config.' . $phpEx); phpbb_require_updated('includes/constants.' . $phpEx); phpbb_require_updated('includes/utf/utf_tools.' . $phpEx); @@ -121,8 +122,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 +131,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); |