oreolek/kostache
1
0
Fork 0
Code Releases Activity

Fixing #3

Browse source
This commit is contained in:
Jeremy Bush 2010-08-20 09:14:48 -05:00
parent d7b1e5ecc7
commit 947d8379b9
2 changed files with 30 additions and 20 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

48
classes/kohana/kostache.php
View file

@ -2,6 +2,8 @@
class Kohana_Kostache extends Mustache class Kohana_Kostache extends Mustache
{ {
protected $_partials_processed = FALSE;
/** /**
* KOstache class factory constructor. * KOstache class factory constructor.
* *
@ -119,32 +121,40 @@ class Kohana_Kostache extends Mustache
public function render($template = null, $view = null, $partials = null) public function render($template = null, $view = null, $partials = null)
{ {
// Override the template location to match kohana's conventions if (NULL === $template)
if ( ! $this->_template)
{ {
$foo = explode('_', get_class($this)); // Override the template location to match kohana's conventions
array_shift($foo); if ( ! $this->_template)
$view_location = strtolower(implode('/', $foo)); {
$foo = explode('_', get_class($this));
array_shift($foo);
$view_location = strtolower(implode('/', $foo));
}
else
{
$view_location = $this->_template;
}
$this->_template = Kohana::find_file('templates', $view_location, 'mustache');
if ( ! $this->_template AND ! $template)
throw new Kohana_Exception('Template file not found: templates/'.$view_location);
$this->_template = file_get_contents($this->_template);
} }
else
{
$view_location = $this->_template;
}
$this->_template = Kohana::find_file('templates', $view_location, 'mustache');
if ( ! $this->_template AND ! $template)
throw new Kohana_Exception('Template file not found: templates/'.$view_location);
$this->_template = file_get_contents($this->_template);
// Convert partials to expanded template strings // Convert partials to expanded template strings
foreach ($this->_partials as $key => $partial_template) if ( ! $this->_partials_processed)
{ {
if ($location = Kohana::find_file('templates', $partial_template, 'mustache')) foreach ($this->_partials as $key => $partial_template)
{ {
$this->_partials[$key] = file_get_contents($location); if ($location = Kohana::find_file('templates', $partial_template, 'mustache'))
{
$this->_partials[$key] = file_get_contents($location);
}
} }
$this->_partials_processed = TRUE;
} }
return parent::render($template, $view, $partials); return parent::render($template, $view, $partials);

2
vendor/mustache vendored

@ -1 +1 @@
Subproject commit ec562fea0916b8d8dedba516d748739a6c126ec0 Subproject commit 8b1c9c113c4e189923e4874be6fca5be715239ac