Template::render uses passed & template parameters together

nette · Oct 15, 2014 · 2c5302a · 2c5302a
1 parent 28d63ea
commit 2c5302a
Showing 1 changed file with 1 addition and 1 deletion.
diff --git a/src/Bridges/ApplicationLatte/Template.php b/src/Bridges/ApplicationLatte/Template.php
@@ -49,7 +49,7 @@ public function getLatte()
 	 */
 	public function render($file = NULL, array $params = array())
 	{
-		$this->latte->render($file ?: $this->file, $params ?: $this->params);
+		$this->latte->render($file ?: $this->file, $params + $this->params);
 	}