Release 1.2.0-RC3

This commit is contained in:
Abel Hoogeveen 2019-03-05 11:16:05 +01:00
parent 581d3f93bf
commit e5268efcdf
No known key found for this signature in database
GPG Key ID: 96C2234920BF4292
2 changed files with 8 additions and 3 deletions

View File

@ -14,7 +14,7 @@
], ],
"require": { "require": {
"php": ">=7.1.0", "php": ">=7.1.0",
"fuzeworks/core": "1.2.0-RC2" "fuzeworks/core": "1.2.0-RC3"
}, },
"require-dev": { "require-dev": {
"ext-json": "*", "ext-json": "*",

View File

@ -128,6 +128,7 @@ class Layout
* @return mixed * @return mixed
* @throws LayoutException On error * @throws LayoutException On error
* @throws EventException * @throws EventException
* @throws Exception\ConfigException
*/ */
public function display(string $file, array $directories = []): bool public function display(string $file, array $directories = []): bool
{ {
@ -514,8 +515,10 @@ class Layout
/** /**
* Resets the layout manager to its default state. * Resets the layout manager to its default state.
*
* @param bool $keep_assigned_vars
*/ */
public function reset() public function reset(bool $keep_assigned_vars = false)
{ {
if (!is_null($this->current_engine)) if (!is_null($this->current_engine))
$this->current_engine->reset(); $this->current_engine->reset();
@ -526,7 +529,9 @@ class Layout
$this->file_extensions = array(); $this->file_extensions = array();
$this->current_engine = null; $this->current_engine = null;
$this->assigned_variables = array(); if (!$keep_assigned_vars)
$this->assigned_variables = array();
Logger::log('Reset the layout manager to its default state'); Logger::log('Reset the layout manager to its default state');
} }
} }