Nette\Latte\Engine: loads UIMacros, FormMacros and CacheMacro before …

…onCompile is invoked
nette · Apr 28, 2014 · a46a9d7 · a46a9d7
1 parent e742ad6
commit a46a9d7
Showing 1 changed file with 15 additions and 7 deletions.
diff --git a/Nette/deprecated/Latte/Engine.php b/Nette/deprecated/Latte/Engine.php
@@ -16,16 +16,11 @@
  */
 class Engine extends Latte\Engine
 {
+	private $fixed = FALSE;
 
 	public function __construct()
 	{
-		$this->onCompile[] = function($latte) {
-			$latte->getParser()->shortNoEscape = TRUE;
-			$latte->getCompiler()->addMacro('cache', new Nette\Bridges\CacheLatte\CacheMacro($latte->getCompiler()));
-			Nette\Bridges\ApplicationLatte\UIMacros::install($latte->getCompiler());
-			Nette\Bridges\FormsLatte\FormMacros::install($latte->getCompiler());
-		};
-
+		$this->getParser()->shortNoEscape = TRUE;
 		$this->addFilter('url', 'rawurlencode');
 		foreach (array('normalize', 'toAscii', 'webalize', 'padLeft', 'padRight', 'reverse') as $name) {
 			$this->addFilter($name, 'Nette\Utils\Strings::' . $name);
@@ -40,6 +35,19 @@ public function __invoke($s)
 	}
 
 
+	public function getCompiler()
+	{
+		$compiler = parent::getCompiler();
+		if (!$this->fixed) {
+			$this->fixed = TRUE;
+			$compiler->addMacro('cache', new Nette\Bridges\CacheLatte\CacheMacro($compiler));
+			Nette\Bridges\ApplicationLatte\UIMacros::install($compiler);
+			Nette\Bridges\FormsLatte\FormMacros::install($compiler);
+		}
+		return $compiler;
+	}
+
+
 	public function & __get($name)
 	{
 		switch (strtolower($name)) {