makary/phpbb
1
0
Fork 0
mirror of https://github.com/phpbb/phpbb.git synced 2025-06-29 06:38:52 +00:00
Code Issues Projects Releases Packages Wiki Activity

[ticket/11150] Load vendor/ext-autoload.php

Browse source 
PHPBB3-11150
This commit is contained in:
Tristan Darricau 2015-09-25 19:36:05 +02:00 • committed by Tristan Darricau
parent e71e6224f5
commit 7958dca09d
No known key found for this signature in database
GPG key ID: 817043C2E29DB881
5 changed files with 23 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
phpBB/bin/phpbbcli.php
View file

@ -71,6 +71,11 @@ require($phpbb_root_path . 'includes/compatibility_globals.' . $phpEx);
register_compatibility_globals(); register_compatibility_globals();
if (is_file($phpbb_root_path . $config['exts_composer_vendor_dir'] . '/autoload.php'))
{
require_once($phpbb_root_path . $config['exts_composer_vendor_dir'] . '/autoload.php');
}
/** @var \phpbb\language\language $language */ /** @var \phpbb\language\language $language */
$language = $phpbb_container->get('language'); $language = $phpbb_container->get('language');
$language->add_lang(array('common', 'acp/common', 'cli')); $language->add_lang(array('common', 'acp/common', 'cli'));

5
phpBB/common.php
View file

@ -141,6 +141,11 @@ require($phpbb_root_path . 'includes/compatibility_globals.' . $phpEx);
register_compatibility_globals(); register_compatibility_globals();
if (is_file($phpbb_root_path . $config['exts_composer_vendor_dir'] . '/autoload.php'))
{
require_once($phpbb_root_path . $config['exts_composer_vendor_dir'] . '/autoload.php');
}
// Add own hook handler // Add own hook handler
require($phpbb_root_path . 'includes/hooks/index.' . $phpEx); require($phpbb_root_path . 'includes/hooks/index.' . $phpEx);
$phpbb_hook = new phpbb_hook(array('exit_handler', 'phpbb_user_session_handler', 'append_sid', array('template', 'display'))); $phpbb_hook = new phpbb_hook(array('exit_handler', 'phpbb_user_session_handler', 'append_sid', array('template', 'display')));

5
phpBB/download/file.php
View file

@ -99,6 +99,11 @@ if (isset($_GET['avatar']))
/* @var $phpbb_avatar_manager \phpbb\avatar\manager */ /* @var $phpbb_avatar_manager \phpbb\avatar\manager */
$phpbb_avatar_manager = $phpbb_container->get('avatar.manager'); $phpbb_avatar_manager = $phpbb_container->get('avatar.manager');
if (is_file($phpbb_root_path . $config['exts_composer_vendor_dir'] . '/autoload.php'))
{
require_once($phpbb_root_path . $config['exts_composer_vendor_dir'] . '/autoload.php');
}
$filename = $request->variable('avatar', ''); $filename = $request->variable('avatar', '');
$avatar_group = false; $avatar_group = false;
$exit = false; $exit = false;

3
phpBB/phpbb/composer/installer.php
View file

@ -161,7 +161,8 @@ class installer
->setUpdateWhitelist($whitelist) ->setUpdateWhitelist($whitelist)
->setWhitelistDependencies(false) ->setWhitelistDependencies(false)
->setIgnorePlatformRequirements(false) ->setIgnorePlatformRequirements(false)
->setDumpAutoloader(false) ->setOptimizeAutoloader(true)
->setDumpAutoloader(true)
->setPreferStable(true) ->setPreferStable(true)
->setRunScripts(false) ->setRunScripts(false)
->setDryRun(false); ->setDryRun(false);

6
phpBB/phpbb/di/container_builder.php
View file

@ -415,6 +415,12 @@ class container_builder
$ext_container->register('cache.driver', '\\phpbb\\cache\\driver\\dummy'); $ext_container->register('cache.driver', '\\phpbb\\cache\\driver\\dummy');
$ext_container->compile(); $ext_container->compile();
$config = $ext_container->get('config');
if (is_file($this->phpbb_root_path . $config['exts_composer_vendor_dir'] . '/autoload.php'))
{
require_once($this->phpbb_root_path . $config['exts_composer_vendor_dir'] . '/autoload.php');
}
$extensions = $ext_container->get('ext.manager')->all_enabled(); $extensions = $ext_container->get('ext.manager')->all_enabled();
// Load each extension found // Load each extension found