Merge remote-tracking branch 'origin/master'

2016-06-20 12:22:04 +02:00 · 2016-06-20 12:22:04 +02:00 · fb177bfbd6
commit fb177bfbd6
parent 8c17e27962 beb243949e
1 changed files with 1 additions and 1 deletions
--- a/libraries/Template.php
+++ b/libraries/Template.php
@ -142,11 +142,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;