diff options
| author | Nathaniel Guse <nathaniel.guse@gmail.com> | 2013-02-23 15:05:47 -0600 |
|---|---|---|
| committer | Nathaniel Guse <nathaniel.guse@gmail.com> | 2013-02-23 15:05:47 -0600 |
| commit | 213bc09743a0d326e2379f3f12bfd549499031b4 (patch) | |
| tree | 73458c54dd199e1f70631d21c5bfa866a900d5ca /phpBB/install | |
| parent | a665ad5c2e44922fbd9790597913091c68311533 (diff) | |
| parent | 6e1e62a77daf77ec3dd4fc131ffbb1a099936ef4 (diff) | |
| download | forums-213bc09743a0d326e2379f3f12bfd549499031b4.tar forums-213bc09743a0d326e2379f3f12bfd549499031b4.tar.gz forums-213bc09743a0d326e2379f3f12bfd549499031b4.tar.bz2 forums-213bc09743a0d326e2379f3f12bfd549499031b4.tar.xz forums-213bc09743a0d326e2379f3f12bfd549499031b4.zip | |
Merge branch 'develop' of git://github.com/phpbb/phpbb3 into feature/migrations-data
Conflicts:
phpBB/install/database_update.php
Diffstat (limited to 'phpBB/install')
| -rw-r--r-- | phpBB/install/install_install.php | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/phpBB/install/install_install.php b/phpBB/install/install_install.php index e0eb9e4472..8803912a53 100644 --- a/phpBB/install/install_install.php +++ b/phpBB/install/install_install.php @@ -1457,12 +1457,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); |