Merge branch 'release/0.4.0'

bobthecow · Oct 30, 2010 · a39c6f6 · a39c6f6 · bobthecow · Oct 30, 2010
2 parents 8b1c9c1 + 35c7250
commit a39c6f6
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 6 deletions.
diff --git a/Mustache.php b/Mustache.php
@@ -385,7 +385,7 @@ protected function _renderTags($template) {
 		$otag = preg_quote($this->_otag, '/');
 		$ctag = preg_quote($this->_ctag, '/');
 
-		$this->_tagRegEx = '/' . $otag . "([#\^\/=!>\\{&])?(.+?)\\1?" . $ctag . "+/s";
+		$this->_tagRegEx = '/' . $otag . "([#\^\/=!<>\\{&])?(.+?)\\1?" . $ctag . "+/s";
 
 		$html = '';
 		$matches = array();
@@ -442,6 +442,7 @@ protected function _renderTag($modifier, $tag_name) {
 				return $this->_renderComment($tag_name);
 				break;
 			case '>':
+			case '<':
 				return $this->_renderPartial($tag_name);
 				break;
 			case '{':
@@ -469,7 +470,7 @@ protected function _renderTag($modifier, $tag_name) {
 	 * @return string
 	 */
 	protected function _renderEscaped($tag_name) {
-		return htmlentities($this->_getVariable($tag_name), null, $this->_charset);
+		return htmlentities($this->_getVariable($tag_name), ENT_COMPAT, $this->_charset);
 	}
 
 	/**
@@ -521,7 +522,7 @@ protected function _changeDelimiter($tag_name) {
 
 		$otag  = preg_quote($this->_otag, '/');
 		$ctag  = preg_quote($this->_ctag, '/');
-		$this->_tagRegEx = '/' . $otag . "([#\^\/=!>\\{&])?(.+?)\\1?" . $ctag . "+/s";
+		$this->_tagRegEx = '/' . $otag . "([#\^\/=!<>\\{&])?(.+?)\\1?" . $ctag . "+/s";
 		return '';
 	}
 
@@ -608,7 +609,7 @@ protected function _findVariableInContext($tag_name, $context) {
 				} else if (isset($view->$tag_name)) {
 					return $view->$tag_name;
 				}
-			} else if (isset($view[$tag_name])) {
+			} else if (array_key_exists($tag_name, $view)) {
 				return $view[$tag_name];
 			}
 		}

diff --git a/examples/escaped/Escaped.php b/examples/escaped/Escaped.php
@@ -1,5 +1,5 @@
 <?php
 
 class Escaped extends Mustache {
-	public $title = "Bear > Shark";
+	public $title = '"Bear" > "Shark"';
 }
diff --git a/examples/escaped/escaped.txt b/examples/escaped/escaped.txt
@@ -1 +1 @@
-<h1>Bear &gt; Shark</h1>
+<h1>&quot;Bear&quot; &gt; &quot;Shark&quot;</h1>