Nemcio/Grav
1
0
Fork 0
mirror of https://github.com/getgrav/grav.git synced 2026-03-02 02:21:29 +01:00
Code Issues Packages Projects Releases Activity

Flex: Fixed event firing too early

Browse Source
This commit is contained in:
Matias Griese
2020-01-27 14:24:48 +02:00
parent 045fae9b6f
commit 5cd4bf5c98
1 changed files with 28 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

45
system/src/Grav/Common/Processors/InitializeProcessor.php
View File

@@ -66,6 +66,8 @@ class InitializeProcessor extends ProcessorBase
$this->loadPlugins();
$this->initializePages($config);
$this->initializeSession($config);
// Wrap call to next handler so that debugger can profile it.
@@ -153,23 +155,6 @@ class InitializeProcessor extends ProcessorBase
date_default_timezone_set($timezone);
}
/** @var Pages $pages */
$pages = $grav['pages'];
$pages->register();
/** @var Uri $uri */
$uri = $grav['uri'];
$uri->init();
// Redirect pages with trailing slash if configured to do so.
$path = $uri->path() ?: '/';
if ($path !== '/'
&& $config->get('system.pages.redirect_trailing_slash', false)
&& Utils::endsWith($path, '/')) {
$redirect = (string) $uri::getCurrentRoute()->toString();
$grav->redirect($redirect);
}
$grav->setLocale();
$this->stopTimer('_init');
@@ -192,6 +177,32 @@ class InitializeProcessor extends ProcessorBase
$this->stopTimer('_plugins_load');
}
protected function initializePages(Config $config): void
{
$this->startTimer('_pages_register', 'Load Plugins');
$grav = $this->container;
/** @var Pages $pages */
$pages = $grav['pages'];
$pages->register();
/** @var Uri $uri */
$uri = $grav['uri'];
$uri->init();
// Redirect pages with trailing slash if configured to do so.
$path = $uri->path() ?: '/';
if ($path !== '/'
&& $config->get('system.pages.redirect_trailing_slash', false)
&& Utils::endsWith($path, '/')) {
$redirect = (string) $uri::getCurrentRoute()->toString();
$grav->redirect($redirect);
}
$this->stopTimer('_pages_register');
}
/**
* @param Config $config
*/