eessppeelllloo/grav
1
0
Fork 0
mirror of https://github.com/getgrav/grav.git synced 2025-12-05 15:29:57 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'release/1.6.1'

Browse Source
This commit is contained in:
Andy Miller
2019-04-11 16:33:08 -06:00
parent 0e03240d13 2e4bb25e2e
commit 31d301911f
3 changed files with 27 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
CHANGELOG.md
View File

@@ -5,7 +5,7 @@
* Improved CSS for the bottom filter bar of DebugBar
1. [](#bugfix)
* Fixed issue with `@import` not being added to top of pipelined css [#2440](https://github.com/getgrav/grav/issues/2440)
* Fixed an error with `DebuggerAssetsProcess` on upgrade
* Hopefull fixed an error with `DebuggerAssetsProcessor` and `RendereProcessor` on upgrade
# v1.6.0
## 04/11/2019

14
system/src/Grav/Common/Processors/DebuggerAssetsProcessor.php
View File

@@ -21,15 +21,17 @@ class DebuggerAssetsProcessor extends ProcessorBase
public function process(ServerRequestInterface $request = null, RequestHandlerInterface $handler = null) : ResponseInterface
{
// Backwards compatibility
if (is_null($request) && is_null($handler)) {
$this->container['debugger']->addAssets();
return new Response();
}
$this->startTimer();
$this->container['debugger']->addAssets();
$this->stopTimer();
// Backwards compatibility
if ($request && $handler) {
return $handler->handle($request);
} else {
return new Response();
}
return $handler->handle($request);
}
}

18
system/src/Grav/Common/Processors/RenderProcessor.php
View File

@@ -22,6 +22,24 @@ class RenderProcessor extends ProcessorBase
public function process(ServerRequestInterface $request = null, RequestHandlerInterface $handler = null) : ResponseInterface
{
// Backwards compatibility
if (is_null($request) && is_null($handler)) {
$container = $this->container;
$output = $container['output'];
$container->output = $output;
$container->fireEvent('onOutputGenerated');
// Set the header type
$container->header();
echo $container->output;
// remove any output
$container->output = '';
$this->container->fireEvent('onOutputRendered');
return new Response();
}
$this->startTimer();
$container = $this->container;