diff options
| author | Nathaniel Guse <nathaniel.guse@gmail.com> | 2013-02-25 13:12:57 -0600 |
|---|---|---|
| committer | Nathaniel Guse <nathaniel.guse@gmail.com> | 2013-02-25 13:12:57 -0600 |
| commit | e632049e197131df9fbe8c078007cf37cf94c241 (patch) | |
| tree | f305a7163e264f2ad9eb23c0d224c91b8a848e34 /phpBB/install/install_install.php | |
| parent | 7a8ae493009eac3d4f5c97279f0be6e10c588002 (diff) | |
| parent | f6a894f07700627b675c2b16aab4714df5819a23 (diff) | |
| download | forums-e632049e197131df9fbe8c078007cf37cf94c241.tar forums-e632049e197131df9fbe8c078007cf37cf94c241.tar.gz forums-e632049e197131df9fbe8c078007cf37cf94c241.tar.bz2 forums-e632049e197131df9fbe8c078007cf37cf94c241.tar.xz forums-e632049e197131df9fbe8c078007cf37cf94c241.zip | |
Merge branch 'feature/migrations-data' of github.com:EXreaction/phpbb3 into feature/migrations-data
# By Dhruv (19) and others
# Via Nathaniel Guse (3) and others
* 'feature/migrations-data' of github.com:EXreaction/phpbb3: (38 commits)
[feature/migrations] Use the user class for language handling
[feature/migrations] Fully revert the removal of the user_msnm field
[feature/migrations] Revert unrelated change to schema_data.sql
[ticket/11179] remove extra & in function call
[ticket/11179] correct start parameter in sphinx search
[ticket/11179] correct start parameter in native author search
[ticket/11179] correct start parameter in native keyword search
[ticket/11179] fix success query path for postgres
[ticket/11179] fix success query path for mysql
[ticket/11179] minor fixes
[ticket/11179] pass start param by reference in postgres
[ticket/11179] correct start param in author search of postgres
[ticket/11179] correct start parameter in psql keyword search
[ticket/11179] pass start param by reference in author search
[ticket/11179] correct start parameter for author search
[ticket/11179] use FOUND_ROWS query to re-search with changed start param
[ticket/11179] pass start parameter by reference
[ticket/11179] correct the start parameter while retrieving from cache
[ticket/11179] add search query in case initial one fails
[ticket/11359] html escape sphinx config data
...
Diffstat (limited to 'phpBB/install/install_install.php')
| -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 a99de9bec9..67649e6b0f 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); |