Moved debugger logic to avoid null page instances.

This commit is contained in:
Andy Miller
2017-03-20 15:25:41 -06:00
parent da61196b7b
commit 13bc19f1e3

View File

@@ -34,16 +34,16 @@ class PageServiceProvider implements ServiceProviderInterface
$page = $pages->dispatch($path);
// some debugger override logic
if ($page->debugger() == false) {
Grav::instance()['debugger']->enabled(false);
}
// Redirection tests
if ($page) {
/** @var Language $language */
$language = $c['language'];
// some debugger override logic
if ($page->debugger() == false) {
Grav::instance()['debugger']->enabled(false);
}
if ($c['config']->get('system.force_ssl')) {
if (!isset($_SERVER['HTTPS']) || $_SERVER["HTTPS"] != "on") {
$url = "https://" . $_SERVER["HTTP_HOST"] . $_SERVER["REQUEST_URI"];