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

Revert attempted fixes

Browse Source
This commit is contained in:
Andy Miller
2019-04-11 16:45:31 -06:00
parent 911eec5e68
commit 32b435b7e6
2 changed files with 2 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -19,14 +19,8 @@ class DebuggerAssetsProcessor extends ProcessorBase
public $id = 'debugger_assets';
public $title = 'Debugger Assets';
public function process(ServerRequestInterface $request = null, RequestHandlerInterface $handler = null) : ResponseInterface
public function process(ServerRequestInterface $request, RequestHandlerInterface $handler) : 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();

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

@@ -20,26 +20,8 @@ class RenderProcessor extends ProcessorBase
public $id = 'render';
public $title = 'Render';
public function process(ServerRequestInterface $request = null, RequestHandlerInterface $handler = null) : ResponseInterface
public function process(ServerRequestInterface $request, RequestHandlerInterface $handler) : 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;