Skip to content

Commit

Permalink
Merge branch 'develop'
Browse files Browse the repository at this point in the history
  • Loading branch information
zombor committed Jan 17, 2013
2 parents d144462 + 189a3c0 commit d7db677
Show file tree
Hide file tree
Showing 7 changed files with 10 additions and 235 deletions.
4 changes: 2 additions & 2 deletions README.markdown
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
# Kostache

Kostache is a [Kohana 3](https://github.com/kohana/kohana) module for using [Mustache](http://defunkt.github.com/mustache/) templates in your application.
Kostache is a [Kohana 3](https://github.com/kohana/kohana) module for using [Mustache](http://mustache.github.com/) templates in your application.

## Usage

Expand Down Expand Up @@ -54,4 +54,4 @@ For specific usage and documentation, see:

[PHP Mustache](http://github.com/bobthecow/mustache.php)

[Original Mustache](http://defunkt.github.com/mustache/)
[Original Mustache](http://mustache.github.com/)
10 changes: 8 additions & 2 deletions classes/Mustache/Loader/Kohana.php
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ public function __construct($base_dir = NULL, $options = array())

if (isset($options['extension']))
{
$this->_extension = '.' . ltrim($options['extension'], '.');
$this->_extension = ltrim($options['extension'], '.');
}
}

Expand All @@ -29,7 +29,13 @@ public function load($name)

protected function _load_file($name)
{
$filename = Kohana::find_file($this->_base_dir, $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);
}

Expand Down
23 changes: 0 additions & 23 deletions config/userguide.php

This file was deleted.

139 changes: 0 additions & 139 deletions guide/kostache/examples.md

This file was deleted.

7 changes: 0 additions & 7 deletions guide/kostache/index.md

This file was deleted.

4 changes: 0 additions & 4 deletions guide/kostache/menu.md

This file was deleted.

58 changes: 0 additions & 58 deletions guide/kostache/usage.md

This file was deleted.

0 comments on commit d7db677

Please sign in to comment.