diff options
| author | Nathan Guse <nathaniel.guse@gmail.com> | 2012-07-23 15:17:42 -0500 |
|---|---|---|
| committer | Unknown Bliss <m@michaelcullum.com> | 2012-09-01 15:05:23 +0100 |
| commit | 8bbab088dd5830d8dd1151a3684dde5c197ba268 (patch) | |
| tree | 6dce9ae98ac0483d01ca9b82c9d915b48fb8fec7 /phpBB/install/install_install.php | |
| parent | 74492b3cdda9538263484a6f2a2042ac1900228a (diff) | |
| download | forums-8bbab088dd5830d8dd1151a3684dde5c197ba268.tar forums-8bbab088dd5830d8dd1151a3684dde5c197ba268.tar.gz forums-8bbab088dd5830d8dd1151a3684dde5c197ba268.tar.bz2 forums-8bbab088dd5830d8dd1151a3684dde5c197ba268.tar.xz forums-8bbab088dd5830d8dd1151a3684dde5c197ba268.zip | |
[ticket/10631] Validation for extensions
PHPBB3-10631
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); |