Merge branch '3.0/develop' into 3.1/develop

This commit is contained in:
Woody Gilk 2011-03-16 09:18:13 -05:00
commit 8104d8f18d
2 changed files with 4 additions and 1 deletions

View file

@ -215,7 +215,7 @@ abstract class Kohana_Kostache {
*/
protected function _stash($template, Kostache $view, array $partials)
{
return new Mustache($template, $view, $partials, array(
return new Kohana_Mustache($template, $view, $partials, array(
'charset' => Kohana::$charset,
));
}

View file

@ -0,0 +1,3 @@
<?php defined('SYSPATH') or die('No direct script access.');
class Kohana_Mustache extends Mustache {}