Commitff2e1d6

authored

Merge pull request#50 from hason/html-failure

Fix infinite loop

2 parentse7020ad +b3a6652 commitff2e1d6Copy full SHA for ff2e1d6

File tree

-2

lines changed

-2

lines changed

Lines changed: 2 additions & 2 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]) .'\|([^"\']*?' .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',`
`33`	`33`	`'twig_inner_' .$options['tag_comment'][0] =>'{((.*?' .preg_quote($options['tag_comment'][1]) .'))}si',`
`34`	`34`	`);`
`35`	`35`	`}`

Lines changed: 1 addition & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -39,6 +39,7 @@ 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><img src="{{\'abc\'}}"/></div>','<div><img src="abc"/></div>'),`
`42`	`43`	`array('<div class="bar" t:attr="class=false">content</div>','<div>content</div>'),`
`43`	`44`	`array('<div class="bar" t:attr="class=\'foo\'">content</div>','<div class="foo">content</div>'),`
`44`	`45`	`array('<div t:attr="condition?class=\'foo\'">content</div>','<div class="foo">content</div>',array('condition'=>1)),`

Comments

(0)