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

Merge branch 'dev' into feature/higher-order-sections

Browse Source
This commit is contained in:
Justin Hileman
2010-12-14 17:00:23 -05:00
parent 771373c70d c7a2064344
commit 8db0b86e45
2 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Mustache.php
+3 -3
View File
@@ -279,7 +279,7 @@ class Mustache {
*/ */
protected function _prepareSectionRegEx($otag, $ctag) { protected function _prepareSectionRegEx($otag, $ctag) {
return sprintf( return sprintf(
'/(?:(?<=\\n)[ \\t]*)?%s(?<type>[%s])(?<tag_name>.+?)%s\\n?/s', '/(?:(?<=\\n)[ \\t]*)?%s(?P<type>[%s])(?P<tag_name>.+?)%s\\n?/s',
preg_quote($otag, '/'), preg_quote($otag, '/'),
self::SECTION_TYPES, self::SECTION_TYPES,
preg_quote($ctag, '/') preg_quote($ctag, '/')
@@ -359,7 +359,7 @@ class Mustache {
*/ */
protected function _preparePragmaRegEx($otag, $ctag) { protected function _preparePragmaRegEx($otag, $ctag) {
return sprintf( return sprintf(
'/%s%%\\s*(?<pragma_name>[\\w_-]+)(?<options_string>(?: [\\w]+=[\\w]+)*)\\s*%s\\n?/s', '/%s%%\\s*(?P<pragma_name>[\\w_-]+)(?P<options_string>(?: [\\w]+=[\\w]+)*)\\s*%s\\n?/s',
preg_quote($otag, '/'), preg_quote($otag, '/'),
preg_quote($ctag, '/') preg_quote($ctag, '/')
); );
@@ -472,7 +472,7 @@ class Mustache {
*/ */
protected function _prepareTagRegEx($otag, $ctag) { protected function _prepareTagRegEx($otag, $ctag) {
return sprintf( return sprintf(
'/(?<whitespace>(?<=\\n)[ \\t]*)?%s(?<type>[%s]?)(?<tag_name>.+?)(?:\\2|})?%s(?:\\s*(?=\\n))?/s', '/(?P<whitespace>(?<=\\n)[ \\t]*)?%s(?P<type>[%s]?)(?P<tag_name>.+?)(?:\\2|})?%s(?:\\s*(?=\\n))?/s',
preg_quote($otag, '/'), preg_quote($otag, '/'),
self::TAG_TYPES, self::TAG_TYPES,
preg_quote($ctag, '/') preg_quote($ctag, '/')
README.markdown
+1 -1
View File
@@ -81,7 +81,7 @@ And render it:
Known Issues Known Issues
------------ ------------
* Sections don't respect delimiter changes -- `delimiters` example currently fails with an * Things get weird when you change delimiters inside a section -- `delimiters` example currently fails with an
"unclosed section" exception. "unclosed section" exception.