Merge branch 'dev' into feature/fix-partials
Conflicts: Mustache.php
This commit is contained in:
+1
-1
@@ -122,6 +122,7 @@ class Mustache {
|
|||||||
$this->_context = array($this);
|
$this->_context = array($this);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
$template = $this->_renderPragmas($template);
|
||||||
return $this->_renderTemplate($template, $this->_context);
|
return $this->_renderTemplate($template, $this->_context);
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -150,7 +151,6 @@ class Mustache {
|
|||||||
* @return string Rendered Mustache template.
|
* @return string Rendered Mustache template.
|
||||||
*/
|
*/
|
||||||
protected function _renderTemplate($template) {
|
protected function _renderTemplate($template) {
|
||||||
$template = $this->_renderPragmas($template);
|
|
||||||
$template = $this->_renderSection($template);
|
$template = $this->_renderSection($template);
|
||||||
return $this->_renderTags($template);
|
return $this->_renderTags($template);
|
||||||
}
|
}
|
||||||
|
|||||||
Reference in New Issue
Block a user