Merge remote-tracking branch 'origin/QA_4_6' into QA_4_6

This commit is contained in:
Weblate 2016-06-20 12:22:06 +02:00
commit 6c8c8de097

View File

@ -143,11 +143,11 @@ class Template
$template = static::BASE_PATH . $this->name . '.phtml';
try {
$this->set($data);
extract($this->data);
$this->helperFunctions = array_merge(
$this->helperFunctions,
$helperFunctions
);
extract($this->data);
ob_start();
if (file_exists($template)) {
include $template;