diff options
| author | David King <imkingdavid@gmail.com> | 2013-02-23 14:08:48 -0500 |
|---|---|---|
| committer | David King <imkingdavid@gmail.com> | 2013-02-23 14:08:48 -0500 |
| commit | 6e1e62a77daf77ec3dd4fc131ffbb1a099936ef4 (patch) | |
| tree | c04b110fb4fc900237665ca0c0ec8904b80f4d82 /phpBB/install | |
| parent | 0987efa18980c2cf8deb1fcb13baa1a43ae6035b (diff) | |
| parent | 872773a21897ccad754a53d7c8ad7899bcc05796 (diff) | |
| download | forums-6e1e62a77daf77ec3dd4fc131ffbb1a099936ef4.tar forums-6e1e62a77daf77ec3dd4fc131ffbb1a099936ef4.tar.gz forums-6e1e62a77daf77ec3dd4fc131ffbb1a099936ef4.tar.bz2 forums-6e1e62a77daf77ec3dd4fc131ffbb1a099936ef4.tar.xz forums-6e1e62a77daf77ec3dd4fc131ffbb1a099936ef4.zip | |
Merge remote-tracking branch 'EXreaction/feature/migrations-extensions' into develop
# By Nathaniel Guse (6) and Nathan Guse (3)
# Via Nathan Guse (1) and Nathaniel Guse (1)
* EXreaction/feature/migrations-extensions:
[feature/migrations] Use getLocalisedMessage() function to get error message
[feature/migrations] Fix failing tests (again)
[feature/migrations] Fix failing tests
[feature/migrations] Catch and display errors from the migrator
[feature/migrations] Call revert correctly when purging an extension
[feature/migrations] Inject Migrator instead of using the container to fetch
[feature/migrations] Fix path to extension migrations
[feature/migrations] Automatically install/revert migrations for extensions
[feature/migrations] Make the container available to extension installers
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); |