diff options
| author | Igor Wiedler <igor@wiedler.ch> | 2013-07-14 15:40:09 -0400 |
|---|---|---|
| committer | Igor Wiedler <igor@wiedler.ch> | 2013-07-14 15:40:19 -0400 |
| commit | 8928240dc3fefd42d8e98132451e2de92ff7cbec (patch) | |
| tree | 4380672984674918fa24fe3aac997ae36c4eab9b /phpBB/includes/functions_container.php | |
| parent | c2b31ca1015872126b40fce5404da7216b8595c6 (diff) | |
| download | forums-8928240dc3fefd42d8e98132451e2de92ff7cbec.tar forums-8928240dc3fefd42d8e98132451e2de92ff7cbec.tar.gz forums-8928240dc3fefd42d8e98132451e2de92ff7cbec.tar.bz2 forums-8928240dc3fefd42d8e98132451e2de92ff7cbec.tar.xz forums-8928240dc3fefd42d8e98132451e2de92ff7cbec.zip | |
[ticket/11574] Fix more issues in the updater
* Stupid mistake in phpbb_create_update_container
* Do not bootstrap extensions in installer/updater
* Fix template lookup in installer/updater
* Do not attempt to delete posts from bots
The latter is a really fun problem. Since deleting posts now depends
on a new db column that does not exist yet, we cannot call delete_post
from a migration, ever. By using retain, we can hack around the issue
for now.
PHPBB3-11574
Diffstat (limited to 'phpBB/includes/functions_container.php')
| -rw-r--r-- | phpBB/includes/functions_container.php | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/phpBB/includes/functions_container.php b/phpBB/includes/functions_container.php index 5c6bd6dd8a..7cbfa17a0e 100644 --- a/phpBB/includes/functions_container.php +++ b/phpBB/includes/functions_container.php @@ -148,9 +148,11 @@ function phpbb_create_install_container($phpbb_root_path, $php_ext) */ function phpbb_create_update_container($phpbb_root_path, $php_ext, $config_path) { + $config_file = $phpbb_root_path . 'config.' . $php_ext; return phpbb_create_compiled_container( + $config_file, array( - new phpbb_di_extension_config($phpbb_root_path . 'config.' . $php_ext), + new phpbb_di_extension_config($config_file), new phpbb_di_extension_core($config_path), ), array( @@ -173,11 +175,6 @@ function phpbb_create_update_container($phpbb_root_path, $php_ext, $config_path) */ function phpbb_create_compiled_container($config_file, array $extensions, array $passes, $phpbb_root_path, $php_ext) { - $installed_exts = phpbb_bootstrap_enabled_exts($config_file, $phpbb_root_path); - - // Now pass the enabled extension paths into the ext compiler extension - $extensions[] = new phpbb_di_extension_ext($installed_exts); - // Create the final container to be compiled and cached $container = phpbb_create_container($extensions, $phpbb_root_path, $php_ext); @@ -258,11 +255,14 @@ function phpbb_create_dumped_container_unless_debug($config_file, array $extensi function phpbb_create_default_container($phpbb_root_path, $php_ext) { $config_file = $phpbb_root_path . 'config.' . $php_ext; + $installed_exts = phpbb_bootstrap_enabled_exts($config_file, $phpbb_root_path); + return phpbb_create_dumped_container_unless_debug( $config_file, array( new phpbb_di_extension_config($config_file), new phpbb_di_extension_core($phpbb_root_path . 'config'), + new phpbb_di_extension_ext($installed_exts), ), array( new phpbb_di_pass_collection_pass(), |