Merge branch '3.0/not-extends-mustache' into 3.1/not-extends-mustache
This commit is contained in:
commit
d8e3a1ffbb
22
LICENSE.md
Normal file
22
LICENSE.md
Normal file
|
@ -0,0 +1,22 @@
|
|||
The MIT License
|
||||
|
||||
Copyright (c) 2010-2011 Jeremy Bush
|
||||
Copyright (c) 2011 Woody Gilk
|
||||
|
||||
Permission is hereby granted, free of charge, to any person obtaining a copy
|
||||
of this software and associated documentation files (the "Software"), to deal
|
||||
in the Software without restriction, including without limitation the rights
|
||||
to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
|
||||
copies of the Software, and to permit persons to whom the Software is
|
||||
furnished to do so, subject to the following conditions:
|
||||
|
||||
The above copyright notice and this permission notice shall be included in
|
||||
all copies or substantial portions of the Software.
|
||||
|
||||
THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
|
||||
IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
|
||||
FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
|
||||
AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
|
||||
LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
|
||||
OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
|
||||
THE SOFTWARE.
|
|
@ -1,5 +1,15 @@
|
|||
<?php defined('SYSPATH') or die('No direct script access.');
|
||||
|
||||
/**
|
||||
* Mustache templates for Kohana.
|
||||
*
|
||||
* @package Kostache
|
||||
* @category Base
|
||||
* @author Jeremy Bush <jeremy.bush@kohanaframework.org>
|
||||
* @author Woody Gilk <woody.gilk@kohanaframework.org>
|
||||
* @copyright (c) 2010-2011 Jeremy Bush
|
||||
* @copyright (c) 2011 Woody Gilk
|
||||
* @license MIT
|
||||
*/
|
||||
abstract class Kohana_Kostache {
|
||||
|
||||
const VERSION = '2.0beta1';
|
||||
|
|
|
@ -1,5 +1,15 @@
|
|||
<?php defined('SYSPATH') or die('No direct script access.');
|
||||
|
||||
/**
|
||||
* Mustache templates for Kohana.
|
||||
*
|
||||
* @package Kostache
|
||||
* @category Base
|
||||
* @author Jeremy Bush <jeremy.bush@kohanaframework.org>
|
||||
* @author Woody Gilk <woody.gilk@kohanaframework.org>
|
||||
* @copyright (c) 2010-2011 Jeremy Bush
|
||||
* @copyright (c) 2011 Woody Gilk
|
||||
* @license MIT
|
||||
*/
|
||||
abstract class Kohana_Kostache_Layout extends Kostache {
|
||||
|
||||
/**
|
||||
|
@ -7,6 +17,11 @@ abstract class Kohana_Kostache_Layout extends Kostache {
|
|||
*/
|
||||
const CONTENT_PARTIAL = 'content';
|
||||
|
||||
/**
|
||||
* @var boolean render template in layout?
|
||||
*/
|
||||
public $render_layout = TRUE;
|
||||
|
||||
/**
|
||||
* @var string layout path
|
||||
*/
|
||||
|
@ -14,7 +29,7 @@ abstract class Kohana_Kostache_Layout extends Kostache {
|
|||
|
||||
public function render()
|
||||
{
|
||||
if ( ! $this->_layout)
|
||||
if ( ! $this->render_layout)
|
||||
{
|
||||
return parent::render();
|
||||
}
|
||||
|
|
Loading…
Reference in a new issue