diff options
| author | David King <imkingdavid@gmail.com> | 2012-09-01 16:38:47 -0400 |
|---|---|---|
| committer | David King <imkingdavid@gmail.com> | 2012-09-01 16:38:47 -0400 |
| commit | 7bf598954c452448c2807428f6517cd75d910f92 (patch) | |
| tree | 1a8ba768a01b36e8fb1159b996383d935fb8b352 /phpBB/install/install_install.php | |
| parent | 43190ebecaeadbc8738da9dcb33b9163652fb9f3 (diff) | |
| parent | 81f7f28cc33d896973c2912097103ea84fa14114 (diff) | |
| download | forums-7bf598954c452448c2807428f6517cd75d910f92.tar forums-7bf598954c452448c2807428f6517cd75d910f92.tar.gz forums-7bf598954c452448c2807428f6517cd75d910f92.tar.bz2 forums-7bf598954c452448c2807428f6517cd75d910f92.tar.xz forums-7bf598954c452448c2807428f6517cd75d910f92.zip | |
Merge remote-tracking branch 'unknownbliss/ticket/10631' into develop
Diffstat (limited to 'phpBB/install/install_install.php')
| -rw-r--r-- | phpBB/install/install_install.php | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/phpBB/install/install_install.php b/phpBB/install/install_install.php index 23593ee51f..9162d5ab60 100644 --- a/phpBB/install/install_install.php +++ b/phpBB/install/install_install.php @@ -250,7 +250,7 @@ class install_install extends module 'S_EXPLAIN' => true, 'S_LEGEND' => false, )); - + // Check for php json support if (@extension_loaded('json')) { @@ -1481,12 +1481,12 @@ class install_install extends module */ function add_modules($mode, $sub) { - global $db, $lang, $phpbb_root_path, $phpEx, $phpbb_extension_manager; + global $db, $lang, $phpbb_root_path, $phpEx, $phpbb_extension_manager, $config; // modules require an extension manager if (empty($phpbb_extension_manager)) { - $phpbb_extension_manager = new phpbb_extension_manager($db, EXT_TABLE, $phpbb_root_path, ".$phpEx"); + $phpbb_extension_manager = new phpbb_extension_manager($db, $config, EXT_TABLE, $phpbb_root_path, ".$phpEx"); } include_once($phpbb_root_path . 'includes/acp/acp_modules.' . $phpEx); |