Merge remote-tracking branch 'anroots/pull-fileload' into develop
Conflicts: classes/Mustache/Loader/Kohana.php
This commit is contained in:
commit
189a3c0ade
|
@ -30,6 +30,12 @@ class Mustache_Loader_Kohana implements Mustache_Loader, Mustache_Loader_Mutable
|
||||||
protected function _load_file($name)
|
protected function _load_file($name)
|
||||||
{
|
{
|
||||||
$filename = Kohana::find_file($this->_base_dir, strtolower($name), $this->_extension);
|
$filename = Kohana::find_file($this->_base_dir, strtolower($name), $this->_extension);
|
||||||
|
|
||||||
|
if ( ! $filename)
|
||||||
|
{
|
||||||
|
throw new Kohana_Exception('Mustache template ":name" not found', array(':name' => $name));
|
||||||
|
}
|
||||||
|
|
||||||
return file_get_contents($filename);
|
return file_get_contents($filename);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
Loading…
Reference in a new issue