Merge branch 'dev' into feature/fix-partials

Conflicts: Mustache.php
2010-05-22 20:30:52 -04:00
parent 605dea1f79 0fd759d8f7
commit 95abf1d52b
1 changed files with 1 additions and 1 deletions
@@ -122,6 +122,7 @@ class Mustache {
 			$this->_context = array($this);
 		}

+		$template = $this->_renderPragmas($template);
 		return $this->_renderTemplate($template, $this->_context);
 	}

@@ -150,7 +151,6 @@ class Mustache {
 	 * @return string Rendered Mustache template.
 	 */
 	protected function _renderTemplate($template) {
-		$template = $this->_renderPragmas($template);
 		$template = $this->_renderSection($template);
 		return $this->_renderTags($template);
 	}