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

Fixing testStickyDelimiters

Browse Source
This commit is contained in:
KevBurnsJr
2011-06-13 01:01:33 -07:00
parent 25070141a9
commit 527bca37f3
1 changed files with 9 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Mustache.php
+9 -3
View File
@@ -219,7 +219,6 @@ class Mustache {
* @return string Rendered Mustache template. * @return string Rendered Mustache template.
*/ */
protected function _renderTemplate($template) { protected function _renderTemplate($template) {
if ($section = $this->_findSection($template)) { if ($section = $this->_findSection($template)) {
list($before, $type, $tag_name, $content, $after) = $section; list($before, $type, $tag_name, $content, $after) = $section;
@@ -271,7 +270,7 @@ class Mustache {
*/ */
protected function _prepareSectionRegEx($otag, $ctag) { protected function _prepareSectionRegEx($otag, $ctag) {
return sprintf( return sprintf(
'/(?:(?<=\\n)[ \\t]*)?%s(?P<type>[%s])(?P<tag_name>.+?)%s\\n?/s', '/(?:(?<=\\n)[ \\t]*)?%s(?:(?P<type>[%s])(?P<tag_name>.+?)|=(?P<delims>.*?)=)%s\\n?/s',
preg_quote($otag, '/'), preg_quote($otag, '/'),
self::SECTION_TYPES, self::SECTION_TYPES,
preg_quote($ctag, '/') preg_quote($ctag, '/')
@@ -297,11 +296,18 @@ class Mustache {
$section_stack = array(); $section_stack = array();
$matches = array(); $matches = array();
while (preg_match($regEx, $template, $matches, PREG_OFFSET_CAPTURE, $search_offset)) { while (preg_match($regEx, $template, $matches, PREG_OFFSET_CAPTURE, $search_offset)) {
$match = $matches[0][0]; $match = $matches[0][0];
$offset = $matches[0][1]; $offset = $matches[0][1];
$type = $matches['type'][0]; $type = $matches['type'][0];
$tag_name = trim($matches['tag_name'][0]); $tag_name = trim($matches['tag_name'][0]);
if (isset($matches['delims'][0])) {
list($otag, $ctag) = explode(' ', $matches['delims'][0]);
$regEx = $this->_prepareSectionRegEx($otag, $ctag);
$search_offset = $offset + strlen($match);
continue;
}
$search_offset = $offset + strlen($match); $search_offset = $offset + strlen($match);