mirror of
https://github.com/phpbb/phpbb.git
synced 2025-06-12 06:18:52 +00:00
[ticket/11101] Delay execution of container processors
Also fix the name of the ext processor service. PHPBB3-11101
This commit is contained in:
parent
23b00d393c
commit
d543f0ffb1
3 changed files with 15 additions and 15 deletions
|
@ -100,13 +100,6 @@ $processor->process($phpbb_container);
|
||||||
$phpbb_class_loader = $phpbb_container->get('class_loader');
|
$phpbb_class_loader = $phpbb_container->get('class_loader');
|
||||||
$phpbb_class_loader_ext = $phpbb_container->get('class_loader.ext');
|
$phpbb_class_loader_ext = $phpbb_container->get('class_loader.ext');
|
||||||
|
|
||||||
$ids = array_keys($phpbb_container->findTaggedServiceIds('container.processor'));
|
|
||||||
foreach ($ids as $id)
|
|
||||||
{
|
|
||||||
$processor = $phpbb_container->get($id);
|
|
||||||
$processor->process($phpbb_container);
|
|
||||||
}
|
|
||||||
|
|
||||||
// set up caching
|
// set up caching
|
||||||
$cache = $phpbb_container->get('cache');
|
$cache = $phpbb_container->get('cache');
|
||||||
|
|
||||||
|
@ -132,6 +125,13 @@ $phpbb_subscriber_loader = $phpbb_container->get('event.subscriber_loader');
|
||||||
$template = $phpbb_container->get('template');
|
$template = $phpbb_container->get('template');
|
||||||
$phpbb_style = $phpbb_container->get('style');
|
$phpbb_style = $phpbb_container->get('style');
|
||||||
|
|
||||||
|
$ids = array_keys($phpbb_container->findTaggedServiceIds('container.processor'));
|
||||||
|
foreach ($ids as $id)
|
||||||
|
{
|
||||||
|
$processor = $phpbb_container->get($id);
|
||||||
|
$processor->process($phpbb_container);
|
||||||
|
}
|
||||||
|
|
||||||
// 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('phpbb_template', 'display')));
|
$phpbb_hook = new phpbb_hook(array('exit_handler', 'phpbb_user_session_handler', 'append_sid', array('phpbb_template', 'display')));
|
||||||
|
|
|
@ -89,7 +89,7 @@ services:
|
||||||
- .%core.php_ext%
|
- .%core.php_ext%
|
||||||
- @cache.driver
|
- @cache.driver
|
||||||
|
|
||||||
processor.config:
|
processor.ext:
|
||||||
class: phpbb_di_processor_ext
|
class: phpbb_di_processor_ext
|
||||||
arguments:
|
arguments:
|
||||||
- @ext.manager
|
- @ext.manager
|
||||||
|
|
|
@ -61,13 +61,6 @@ if (isset($_GET['avatar']))
|
||||||
$phpbb_class_loader = $phpbb_container->get('class_loader');
|
$phpbb_class_loader = $phpbb_container->get('class_loader');
|
||||||
$phpbb_class_loader_ext = $phpbb_container->get('class_loader.ext');
|
$phpbb_class_loader_ext = $phpbb_container->get('class_loader.ext');
|
||||||
|
|
||||||
$ids = array_keys($phpbb_container->findTaggedServiceIds('container.processor'));
|
|
||||||
foreach ($ids as $id)
|
|
||||||
{
|
|
||||||
$processor = $phpbb_container->get($id);
|
|
||||||
$processor->process($phpbb_container);
|
|
||||||
}
|
|
||||||
|
|
||||||
// set up caching
|
// set up caching
|
||||||
$cache = $phpbb_container->get('cache');
|
$cache = $phpbb_container->get('cache');
|
||||||
|
|
||||||
|
@ -92,6 +85,13 @@ if (isset($_GET['avatar']))
|
||||||
$phpbb_extension_manager = $phpbb_container->get('ext.manager');
|
$phpbb_extension_manager = $phpbb_container->get('ext.manager');
|
||||||
$phpbb_subscriber_loader = $phpbb_container->get('event.subscriber_loader');
|
$phpbb_subscriber_loader = $phpbb_container->get('event.subscriber_loader');
|
||||||
|
|
||||||
|
$ids = array_keys($phpbb_container->findTaggedServiceIds('container.processor'));
|
||||||
|
foreach ($ids as $id)
|
||||||
|
{
|
||||||
|
$processor = $phpbb_container->get($id);
|
||||||
|
$processor->process($phpbb_container);
|
||||||
|
}
|
||||||
|
|
||||||
// worst-case default
|
// worst-case default
|
||||||
$browser = strtolower($request->header('User-Agent', 'msie 6.0'));
|
$browser = strtolower($request->header('User-Agent', 'msie 6.0'));
|
||||||
|
|
||||||
|
|
Loading…
Add table
Reference in a new issue