diff options
| author | Nathan Guse <nathaniel.guse@gmail.com> | 2013-01-10 19:32:39 -0600 |
|---|---|---|
| committer | Nathan Guse <nathaniel.guse@gmail.com> | 2013-02-06 11:31:49 -0600 |
| commit | 8d3a82a4fa8ced50fbc1d1019ef439d1d5c81e71 (patch) | |
| tree | 482e300d80d3c702422a9a82bdb99b0e7bcf14ec /phpBB/install | |
| parent | effaef6bddf49b9016d66bd64706392fcdb452b3 (diff) | |
| download | forums-8d3a82a4fa8ced50fbc1d1019ef439d1d5c81e71.tar forums-8d3a82a4fa8ced50fbc1d1019ef439d1d5c81e71.tar.gz forums-8d3a82a4fa8ced50fbc1d1019ef439d1d5c81e71.tar.bz2 forums-8d3a82a4fa8ced50fbc1d1019ef439d1d5c81e71.tar.xz forums-8d3a82a4fa8ced50fbc1d1019ef439d1d5c81e71.zip | |
[feature/migrations] Make the container available to extension installers
This allows extensions to load and install migrations easily as per their
needs.
PHPBB3-11318
Diffstat (limited to 'phpBB/install')
| -rw-r--r-- | phpBB/install/database_update.php | 4 | ||||
| -rw-r--r-- | phpBB/install/install_install.php | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/phpBB/install/database_update.php b/phpBB/install/database_update.php index 4e17a1429c..0a065573bf 100644 --- a/phpBB/install/database_update.php +++ b/phpBB/install/database_update.php @@ -685,12 +685,12 @@ function _write_result($no_updates, $errored, $error_ary) function _add_modules($modules_to_install) { - global $phpbb_root_path, $phpEx, $db, $phpbb_extension_manager, $config; + global $phpbb_root_path, $phpEx, $db, $phpbb_extension_manager, $config, $phpbb_container; // modules require an extension manager if (empty($phpbb_extension_manager)) { - $phpbb_extension_manager = new phpbb_extension_manager($db, $config, EXT_TABLE, $phpbb_root_path, ".$phpEx"); + $phpbb_extension_manager = $phpbb_container->get('ext.manager'); } include_once($phpbb_root_path . 'includes/acp/acp_modules.' . $phpEx); diff --git a/phpBB/install/install_install.php b/phpBB/install/install_install.php index 1ab9caee0a..dd90335480 100644 --- a/phpBB/install/install_install.php +++ b/phpBB/install/install_install.php @@ -1456,12 +1456,12 @@ class install_install extends module */ function add_modules($mode, $sub) { - global $db, $lang, $phpbb_root_path, $phpEx, $phpbb_extension_manager, $config; + global $db, $lang, $phpbb_root_path, $phpEx, $phpbb_extension_manager, $config, $phpbb_container; // modules require an extension manager if (empty($phpbb_extension_manager)) { - $phpbb_extension_manager = new phpbb_extension_manager($db, $config, EXT_TABLE, $phpbb_root_path, ".$phpEx"); + $phpbb_extension_manager = $phpbb_container->get('ext.manager'); } include_once($phpbb_root_path . 'includes/acp/acp_modules.' . $phpEx); |