From c6061baf49d2c2ff40c89fdfb0c181ec7616e441 Mon Sep 17 00:00:00 2001 From: Justin Hileman Date: Fri, 30 Apr 2010 20:36:18 -0400 Subject: [PATCH] Changed protected _render function to _renderTemplate to avoid ambiguity. --- Mustache.php | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/Mustache.php b/Mustache.php index e0dc769..6578862 100644 --- a/Mustache.php +++ b/Mustache.php @@ -99,7 +99,7 @@ class Mustache { $this->_context = array($this); } - return $this->_render($template, $this->_context); + return $this->_renderTemplate($template, $this->_context); } /** @@ -127,7 +127,7 @@ class Mustache { * @param array &$context * @return string Rendered Mustache template. */ - protected function _render($template, &$context) { + protected function _renderTemplate($template, &$context) { $template = $this->_renderPragmas($template, $context); $template = $this->_renderSection($template, $context); return $this->_renderTags($template, $context); @@ -169,12 +169,12 @@ class Mustache { if ($this->_varIsIterable($val)) { foreach ($val as $local_context) { $c = $this->_getContext($context, $local_context); - $replace .= $this->_render($content, $c); + $replace .= $this->_renderTemplate($content, $c); } } else if ($val) { if (is_array($val) || is_object($val)) { $c = $this->_getContext($context, $val); - $replace .= $this->_render($content, $c); + $replace .= $this->_renderTemplate($content, $c); } else { $replace .= $content; }