mirror_php/winter
1
0
Fork 0
mirror of https://github.com/wintercms/winter.git synced 2024-06-28 05:33:29 +02:00
Code Issues Projects Releases Wiki Activity

Fixes #328 - Move Twig init to Controller constructor

Browse Source
This commit is contained in:
Sam Georges 2014-06-20 17:37:01 +10:00
parent b3bbfb154b
commit dc9acd472a
1 changed files with 2 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
modules/cms/classes/Controller.php
View File

@ -93,6 +93,7 @@ class Controller extends BaseController
$this->theme = $theme ? $theme : Theme::getActiveTheme();
$this->assetPath = Config::get('cms.themesDir').'/'.$this->theme->getDirName();
$this->router = new Router($this->theme);
$this->initTwigEnvironment();
}
/**
@ -145,8 +146,6 @@ class Controller extends BaseController
$this->layout = $layout;
$this->initTwigEnvironment();
/*
* The 'this' variable is reserved for default variables.
*/
@ -218,7 +217,7 @@ class Controller extends BaseController
/**
* Initializes the Twig environment and loader.
* Registers the \Cms\Twig\Extension object with Twig.
* @return \Twig_Environment Returns the Twig environment object.
* @return void
*/
protected function initTwigEnvironment()
{