geckon01/Twig
1
0
Fork 0
mirror of https://github.com/twigphp/Twig.git synced 2026-09-18 05:16:30 +00:00
Code Issues Packages Projects Releases Wiki Activity

fixed parsing problem when a large chunk of text is enclosed in a raw tag

Browse Source 
This is a quick and ugly fix... This should be refactored later on
This commit is contained in:
Fabien Potencier
2011-05-09 17:35:00 +02:00
parent d88e7ca244
commit 93425b32cb
1 changed files with 8 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
lib/Twig/Lexer.php
+8 -2
View File
@@ -158,9 +158,15 @@ class Twig_Lexer implements Twig_LexerInterface
case $this->options['tag_block'][0]:
// raw data?
if (preg_match('/\s*raw\s*'.preg_quote($this->options['tag_block'][1], '/').'(.*?)'.preg_quote($this->options['tag_block'][0], '/').'\s*endraw\s*'.preg_quote($this->options['tag_block'][1], '/').'/As', $this->code, $match, null, $this->cursor)) {
$this->pushToken(Twig_Token::TEXT_TYPE, $match[1]);
if (preg_match('/\s*raw\s*'.preg_quote($this->options['tag_block'][1], '/').'/As', $this->code, $match, null, $this->cursor)) {
$this->moveCursor($match[0]);
if (!preg_match('/'.preg_quote($this->options['tag_block'][0], '/').'\s*endraw\s*'.preg_quote($this->options['tag_block'][1], '/').'/s', $this->code, $match, null, $this->cursor)) {
throw new Twig_Error_Syntax(sprintf('Unexpected end of file: Unclosed "block"'));
}
$pos = strpos($this->code, $match[0], $this->cursor);
$text = substr($this->code, $this->cursor, $pos - $this->cursor);
$this->pushToken(Twig_Token::TEXT_TYPE, $text);
$this->moveCursor($text.$match[0]);
$this->state = self::STATE_DATA;
} else {
$this->pushToken(Twig_Token::BLOCK_START_TYPE);