oreolek/kostache
1
0
Fork 0
Code Releases Activity

Merge branch '3.1/master' into 3.1/develop

Browse source
This commit is contained in:
Woody Gilk 2011-03-29 11:04:11 -05:00
parent 8104d8f18d cd21edb412
commit eb9fc9e8c3
1 changed files with 12 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
classes/kohana/kostache.php
View file

@ -12,7 +12,7 @@
*/
abstract class Kohana_Kostache {
const VERSION = '2.0.1';
const VERSION = '2.0.2';
/**
* Factory method for Kostache views. Accepts a template path and an
@ -60,8 +60,16 @@ abstract class Kohana_Kostache {
{
if ( ! $template)
{
// Detect the template for this class
$template = $this->_detect_template();
if ($this->_template)
{
// Load the template defined in the view
$template = $this->_template;
}
else
{
// Detect the template for this class
$template = $this->_detect_template();
}
}
// Load the template
@ -103,7 +111,7 @@ abstract class Kohana_Kostache {
ob_start();
// Render the exception
Kohana_Exception::text($e);
Kohana_Exception::handler($e);
return (string) ob_get_clean();
}