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

Merge branch 'hotfix/0.5.1'

Browse Source
This commit is contained in:
Justin Hileman
2010-12-14 16:53:10 -05:00
parent a448453da3 7d239849da
commit 6eb3ea0c8b
1 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Mustache.php
+3 -3
View File
@@ -274,7 +274,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, '/')
@@ -354,7 +354,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, '/')
); );
@@ -467,7 +467,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, '/')