Framework/Mustache
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'dev' into feature/mustache-spec

Browse Source
This commit is contained in:
Justin Hileman
2010-10-30 16:53:35 -04:00
parent 596fb3c1d4 f3cb0877ff
commit 963faf5de9
1 changed files with 3 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Mustache.php
+3 -2
View File
@@ -385,7 +385,7 @@ class Mustache {
$otag = preg_quote($this->_otag, '/'); $otag = preg_quote($this->_otag, '/');
$ctag = preg_quote($this->_ctag, '/'); $ctag = preg_quote($this->_ctag, '/');
$this->_tagRegEx = '/' . $otag . "([#\^\/=!>\\{&])?(.+?)\\1?" . $ctag . "+/s"; $this->_tagRegEx = '/' . $otag . "([#\^\/=!<>\\{&])?(.+?)\\1?" . $ctag . "+/s";
$html = ''; $html = '';
$matches = array(); $matches = array();
@@ -442,6 +442,7 @@ class Mustache {
return $this->_renderComment($tag_name); return $this->_renderComment($tag_name);
break; break;
case '>': case '>':
case '<':
return $this->_renderPartial($tag_name); return $this->_renderPartial($tag_name);
break; break;
case '{': case '{':
@@ -521,7 +522,7 @@ class Mustache {
$otag = preg_quote($this->_otag, '/'); $otag = preg_quote($this->_otag, '/');
$ctag = preg_quote($this->_ctag, '/'); $ctag = preg_quote($this->_ctag, '/');
$this->_tagRegEx = '/' . $otag . "([#\^\/=!>\\{&])?(.+?)\\1?" . $ctag . "+/s"; $this->_tagRegEx = '/' . $otag . "([#\^\/=!<>\\{&])?(.+?)\\1?" . $ctag . "+/s";
return ''; return '';
} }