Nemcio/Grav
1
0
Fork 0
mirror of https://github.com/getgrav/grav.git synced 2025-11-01 19:05:58 +01:00
Code Issues Packages Projects Releases Activity

Refactored some Twig event names for consistency, also processing: to process: again for consistency.

Browse Source
This commit is contained in:
Andy Miller
2014-08-12 09:24:26 -06:00
parent 4540bb179f
commit 87c342d244
3 changed files with 14 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
system/src/Grav/Common/Grav.php
View File

@@ -88,7 +88,6 @@ class Grav extends Getters
ini_set('display_errors', true); ini_set('display_errors', true);
} }
Debugger::$productionMode = Debugger::DEVELOPMENT; Debugger::$productionMode = Debugger::DEVELOPMENT;
$this->fireEvent('onAfterInitDebug');
} }
// Get the Caching setup // Get the Caching setup

22
system/src/Grav/Common/Page/Page.php
View File

@@ -63,7 +63,7 @@ class Page
protected $order_manual; protected $order_manual;
protected $modular; protected $modular;
protected $modular_twig; protected $modular_twig;
protected $processing; protected $process;
protected $summary_size; protected $summary_size;
/** /**
@@ -88,7 +88,7 @@ class Page
$this->routable = true; $this->routable = true;
$this->taxonomy = array(); $this->taxonomy = array();
$this->processing = $config->get('system.pages.process'); $this->process = $config->get('system.pages.process');
} }
/** /**
@@ -204,9 +204,9 @@ class Page
if (isset($this->header->max_count)) { if (isset($this->header->max_count)) {
$this->max_count = intval($this->header->max_count); $this->max_count = intval($this->header->max_count);
} }
if (isset($this->header->processing)) { if (isset($this->header->process)) {
foreach ($this->header->processing as $process => $status) { foreach ($this->header->process as $process => $status) {
$this->processing[$process] = $status; $this->process[$process] = $status;
} }
} }
} }
@@ -677,18 +677,18 @@ class Page
} }
/** /**
* Gets and Sets the processing setup for this Page. This is multi-dimensional array that consists of * Gets and Sets the process setup for this Page. This is multi-dimensional array that consists of
* a simple array of arrays with the form array("markdown"=>true) for example * a simple array of arrays with the form array("markdown"=>true) for example
* *
* @param array $var an Array of name value pairs where the name is the process and value is true or false * @param array $var an Array of name value pairs where the name is the process and value is true or false
* @return array an Array of name value pairs where the name is the process and value is true or false * @return array an Array of name value pairs where the name is the process and value is true or false
*/ */
public function processing($var = null) public function process($var = null)
{ {
if ($var !== null) { if ($var !== null) {
$this->processing = (array) $var; $this->process = (array) $var;
} }
return $this->processing; return $this->process;
} }
/** /**
@@ -1004,7 +1004,7 @@ class Page
if ($var !== null) { if ($var !== null) {
$this->modular_twig = (bool) $var; $this->modular_twig = (bool) $var;
if ($var) { if ($var) {
$this->processing['twig'] = true; $this->process['twig'] = true;
} }
} }
return $this->modular_twig; return $this->modular_twig;
@@ -1018,7 +1018,7 @@ class Page
*/ */
public function shouldProcess($process) public function shouldProcess($process)
{ {
return isset($this->processing[$process]) ? (bool) $this->processing[$process] : false; return isset($this->process[$process]) ? (bool) $this->process[$process] : false;
} }
/** /**

6
system/src/Grav/Common/Twig.php
View File

@@ -165,7 +165,7 @@ class Twig
$content = $content !== null ? $content : $item->content(); $content = $content !== null ? $content : $item->content();
// override the twig header vars for local resolution // override the twig header vars for local resolution
$this->grav->fireEvent('onAfterPageTwigVars'); $this->grav->fireEvent('onAfterTwigPageVars');
$twig_vars = $this->twig_vars; $twig_vars = $this->twig_vars;
$twig_vars['page'] = $item; $twig_vars['page'] = $item;
@@ -197,7 +197,7 @@ class Twig
$this->init(); $this->init();
// override the twig header vars for local resolution // override the twig header vars for local resolution
$this->grav->fireEvent('onAfterStringTwigVars'); $this->grav->fireEvent('onAfterTwigVars');
$vars += $this->twig_vars; $vars += $this->twig_vars;
$name = '@Var:' . $string; $name = '@Var:' . $string;
@@ -220,7 +220,7 @@ class Twig
$this->init(); $this->init();
// set the page now its been processed // set the page now its been processed
$this->grav->fireEvent('onAfterSiteTwigVars'); $this->grav->fireEvent('onAfterTwigSiteVars');
$twig_vars = $this->twig_vars; $twig_vars = $this->twig_vars;
$pages = $this->grav->pages; $pages = $this->grav->pages;
$page = $this->grav->page; $page = $this->grav->page;