Skip to content

Commit

Permalink
Revert attempted fixes
Browse files Browse the repository at this point in the history
  • Loading branch information
rhukster committed Apr 11, 2019
1 parent 911eec5 commit 32b435b
Show file tree
Hide file tree
Showing 2 changed files with 2 additions and 26 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -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();
Expand Down
20 changes: 1 addition & 19 deletions system/src/Grav/Common/Processors/RenderProcessor.php
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down

0 comments on commit 32b435b

Please sign in to comment.