mirror of
https://github.com/getgrav/grav.git
synced 2026-07-19 23:50:43 +02:00
Fix for page-level debugger override changing the option site-wide
This commit is contained in:
@@ -3,6 +3,7 @@
|
||||
|
||||
1. [](#bugfix)
|
||||
* Simplified modular/twig processing logic and fixed an issue with system process config [#1351](https://github.com/getgrav/grav/issues/1351)
|
||||
* Fix for page-level debugger override changing the option site-wide
|
||||
|
||||
# v1.2.0-rc.2
|
||||
## 03/17/2017
|
||||
|
||||
@@ -146,11 +146,6 @@ class Page
|
||||
$this->extension($extension);
|
||||
}
|
||||
|
||||
// some debugger logic
|
||||
if (isset($this->debugger) && $this->debugger == false) {
|
||||
Grav::instance()['debugger']->enabled(false);
|
||||
}
|
||||
|
||||
// extract page language from page extension
|
||||
$language = trim(basename($this->extension(), 'md'), '.') ?: null;
|
||||
$this->language($language);
|
||||
@@ -1383,6 +1378,20 @@ class Page
|
||||
return $this->process;
|
||||
}
|
||||
|
||||
/**
|
||||
* Returns the state of the debugger override etting for this page
|
||||
*
|
||||
* @return mixed
|
||||
*/
|
||||
public function debugger()
|
||||
{
|
||||
if (isset($this->debugger) && $this->debugger == false) {
|
||||
return false;
|
||||
} else {
|
||||
return true;
|
||||
}
|
||||
}
|
||||
|
||||
/**
|
||||
* Function to merge page metadata tags and build an array of Metadata objects
|
||||
* that can then be rendered in the page.
|
||||
|
||||
@@ -34,6 +34,11 @@ 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 */
|
||||
|
||||
Reference in New Issue
Block a user