diff --git a/system/src/Grav/Common/Processors/DebuggerAssetsProcessor.php b/system/src/Grav/Common/Processors/DebuggerAssetsProcessor.php index 5160711e4..5fc152bcb 100644 --- a/system/src/Grav/Common/Processors/DebuggerAssetsProcessor.php +++ b/system/src/Grav/Common/Processors/DebuggerAssetsProcessor.php @@ -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); + } } diff --git a/system/src/Grav/Common/Processors/RenderProcessor.php b/system/src/Grav/Common/Processors/RenderProcessor.php index ff9128b3d..33ca9066c 100644 --- a/system/src/Grav/Common/Processors/RenderProcessor.php +++ b/system/src/Grav/Common/Processors/RenderProcessor.php @@ -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;