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

Make section rendering delimiter-chage-aware. Fixes longstanding section/delimiter bug.

Browse Source
This commit is contained in:
Justin Hileman
2011-06-13 04:00:49 -04:00
parent a16d9ed51c
commit 1abf854af3
1 changed files with 7 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Mustache.php
+7 -1
View File
@@ -271,7 +271,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,6 +297,12 @@ 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)) {
if (isset($matches['delims'][0])) {
list($otag, $ctag) = explode(' ', $matches['delims'][0]);
$regEx = $this->_prepareSectionRegEx($otag, $ctag);
$search_offset = $matches[0][1] + strlen($matches[0][0]);
continue;
}
$match = $matches[0][0]; $match = $matches[0][0];
$offset = $matches[0][1]; $offset = $matches[0][1];