Merge pull request #51 from avilaj/develop

silentworks · silentworks · commit 4db71c83fe4f · 2012-12-12T01:34:28.000-08:00
Added evaluation to the parsed template.
diff --git a/Views/Haml.php b/Views/Haml.php
@@ -78,6 +78,7 @@ public function render($template)
 		require_once self::$hamlDirectory . '/HamlPHP/Storage/FileStorage.php';
 		$parser = new \HamlPHP(new \FileStorage(self::$hamlCacheDirectory));
 
-		return $parser->parseFile(self::$hamlTemplatesDirectory . $template, $this->data);
+		$file = $parser->parseFile(self::$hamlTemplatesDirectory . $template);
+		return $parser->evaluate($file, $this->data);
 	}
 }

Original file line number	Diff line number	Diff line change
`@@ -78,6 +78,7 @@ public function render($template)`
`78`	`78`	`require_once self::$hamlDirectory . '/HamlPHP/Storage/FileStorage.php';`
`79`	`79`	`$parser = new \HamlPHP(new \FileStorage(self::$hamlCacheDirectory));`
`80`	`80`
`81`		`- return $parser->parseFile(self::$hamlTemplatesDirectory . $template, $this->data);`
	`81`	`+ $file = $parser->parseFile(self::$hamlTemplatesDirectory . $template);`
	`82`	`+ return $parser->evaluate($file, $this->data);`
`82`	`83`	`}`
`83`	`84`	`}`