mirror/php-phpbb
1
0
Fork 0
mirror of https://github.com/phpbb/phpbb.git synced 2025-07-31 14:00:31 +02:00
Code Issues Releases Wiki Activity

Merge branch 'develop' of git://github.com/phpbb/phpbb3 into feature/migrations-data

Browse Source 
Conflicts:
	phpBB/install/database_update.php
This commit is contained in:
Nathaniel Guse
2013-02-23 15:05:47 -06:00
parent a665ad5c2e 6e1e62a77d
commit 213bc09743
24 changed files with 429 additions and 138 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
phpBB/install/install_install.php
View File

@@ -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);