Merge branch '3.1.x' of github.com:kohana/core into 3.1.x

kohana · Dec 15, 2010 · 8053fa9 · 8053fa9
2 parents 99584f9 + 55ec7ae
commit 8053fa9
Showing 1 changed file with 1 addition and 1 deletion.
diff --git a/classes/kohana/controller/template.php b/classes/kohana/controller/template.php
@@ -41,7 +41,7 @@ public function after()
 	{
 		if ($this->auto_render === TRUE)
 		{
-			$this->response->body = $this->template;
+			$this->response->body = $this->template->render();
 		}
 
 		return parent::after();