Commit4bec6f1

authored

Merge pull request#52 from hason/patch

Fix regular expressions

2 parentsff2e1d6 +7caac34 commit4bec6f1Copy full SHA for 4bec6f1

File tree

-3

lines changed

-3

lines changed

Lines changed: 3 additions & 3 deletions

Original file line number	Diff line number	Diff line change
`@@ -28,8 +28,8 @@ public function __construct(array $placeholder = array('[_TWITAL_[', ']_TWITAL_]`
`28`	`28`	`$this->regexes =array(`
`29`	`29`	`'twig_start' =>'{(' .preg_quote($options['tag_block'][0]) .'\|' .preg_quote($options['tag_variable'][0]) .'\|' .preg_quote($options['tag_comment'][0]) .')}',`
`30`	`30`	`'placeholder' =>'{(' .preg_quote($placeholder[0]) .'(.+)' .preg_quote($placeholder[1]) .')}siuU',`
`31`		`-'twig_inner_' .$options['tag_block'][0] =>'{(' .self::REGEX_STRING .'\|' .preg_quote($options['tag_block'][1]) .'\|([^"\']*?' .preg_quote($options['tag_block'][1]) .')\|[^"\']+?)}si',`
`32`		`-'twig_inner_' .$options['tag_variable'][0] =>'{(' .self::REGEX_STRING .'\|' .preg_quote($options['tag_variable'][1]) .'\|([^"\']*?' .preg_quote($options['tag_variable'][1]) .')\|[^"\']+?)}si',`
	`31`	`+'twig_inner_' .$options['tag_block'][0] =>'{(' .self::REGEX_STRING .'\|([^"\']*?' .preg_quote($options['tag_block'][1]) .')\|[^"\']+?)}si',`
	`32`	`+'twig_inner_' .$options['tag_variable'][0] =>'{(' .self::REGEX_STRING .'\|([^"\']*?' .preg_quote($options['tag_variable'][1]) .')\|[^"\']+?)}si',`
`33`	`33`	`'twig_inner_' .$options['tag_comment'][0] =>'{((.*?' .preg_quote($options['tag_comment'][1]) .'))}si',`
`34`	`34`	`);`
`35`	`35`	`}`
`@@ -50,7 +50,7 @@ protected function processTwig($template, \CLosure $processor)`
`50`	`50`	`$twig =$buffer;`
`51`	`51`	`break;`
`52`	`52`	`}`
`53`		`- };`
	`53`	`+ }`
`54`	`54`
`55`	`55`	`if (!$twig) {`
`56`	`56`	`continue;`

Lines changed: 2 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -39,6 +39,8 @@ public function getData()`
`39`	`39`	`{`
`40`	`40`	`returnarray(`
`41`	`41`	`array('<div t:attr="class=\'foo\'">content</div>','<div class="foo">content</div>'),`
	`42`	`+array('<div class="{{\'class\' }}"><div>{%if true%}<div rel="{{abc}}"></div>{%endif%}</div></div>','<div class="class"><div><div rel=""/></div></div>'),`
	`43`	`+array('<div class="{{\'class\'}}"><div>{%if true%}<div rel="{{abc}}"></div>{%endif%}</div></div>','<div class="class"><div><div rel=""/></div></div>'),`
`42`	`44`	`array('<div><img src="{{\'abc\'}}"/></div>','<div><img src="abc"/></div>'),`
`43`	`45`	`array('<div class="bar" t:attr="class=false">content</div>','<div>content</div>'),`
`44`	`46`	`array('<div class="bar" t:attr="class=\'foo\'">content</div>','<div class="foo">content</div>'),`

Comments

(0)