smarty-php/smarty
1
0
Fork 0
mirror of https://github.com/smarty-php/smarty.git synced 2025-08-04 10:24:26 +02:00
Code Issues Packages Projects Releases Wiki Activity

Fix $smarty.capture access.

Browse Source
This commit is contained in:
andrey
2001-11-27 20:04:47 +00:00
parent e9b240e28a
commit 00cd0acd95
2 changed files with 8 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
Smarty_Compiler.class.php
View File

@@ -616,7 +616,7 @@ class Smarty_Compiler extends Smarty {
$this->_capture_stack[] = $buffer; $this->_capture_stack[] = $buffer;
} else { } else {
$buffer = array_pop($this->_capture_stack); $buffer = array_pop($this->_capture_stack);
$output = "<?php \$this->_tpl_vars['smarty']['capture'][$buffer] = ob_get_contents(); ob_end_clean(); ?>"; $output = "<?php \$this->_smarty_vars['capture'][$buffer] = ob_get_contents(); ob_end_clean(); ?>";
} }
return $output; return $output;
@@ -631,8 +631,8 @@ class Smarty_Compiler extends Smarty {
{ {
/* Tokenize args for 'if' tag. */ /* Tokenize args for 'if' tag. */
preg_match_all('/(?: preg_match_all('/(?:
"[^"\\\\]*(?:\\\\.[^"\\\\]*)*" | # match all double quoted strings allowed escaped double quotes "[^"\\\\]*(?:\\\\.[^"\\\\]*)*" | # match all double quoted strings allowing escaped double quotes
\'[^\'\\\\]*(?:\\\\.[^\'\\\\]*)*\' | # match all single quoted strings allowed escaped single quotes \'[^\'\\\\]*(?:\\\\.[^\'\\\\]*)*\' | # match all single quoted strings allowing escaped single quotes
[(),] | # match parentheses and commas [(),] | # match parentheses and commas
[^\s(),]+ # match any other token that is not any of the above [^\s(),]+ # match any other token that is not any of the above
)/x', $tag_args, $match); )/x', $tag_args, $match);
@@ -1094,6 +1094,7 @@ class Smarty_Compiler extends Smarty {
case 'server': case 'server':
case 'session': case 'session':
case 'request': case 'request':
case 'capture':
return null; return null;
default: default:

7
libs/Smarty_Compiler.class.php
View File

@@ -616,7 +616,7 @@ class Smarty_Compiler extends Smarty {
$this->_capture_stack[] = $buffer; $this->_capture_stack[] = $buffer;
} else { } else {
$buffer = array_pop($this->_capture_stack); $buffer = array_pop($this->_capture_stack);
$output = "<?php \$this->_tpl_vars['smarty']['capture'][$buffer] = ob_get_contents(); ob_end_clean(); ?>"; $output = "<?php \$this->_smarty_vars['capture'][$buffer] = ob_get_contents(); ob_end_clean(); ?>";
} }
return $output; return $output;
@@ -631,8 +631,8 @@ class Smarty_Compiler extends Smarty {
{ {
/* Tokenize args for 'if' tag. */ /* Tokenize args for 'if' tag. */
preg_match_all('/(?: preg_match_all('/(?:
"[^"\\\\]*(?:\\\\.[^"\\\\]*)*" | # match all double quoted strings allowed escaped double quotes "[^"\\\\]*(?:\\\\.[^"\\\\]*)*" | # match all double quoted strings allowing escaped double quotes
\'[^\'\\\\]*(?:\\\\.[^\'\\\\]*)*\' | # match all single quoted strings allowed escaped single quotes \'[^\'\\\\]*(?:\\\\.[^\'\\\\]*)*\' | # match all single quoted strings allowing escaped single quotes
[(),] | # match parentheses and commas [(),] | # match parentheses and commas
[^\s(),]+ # match any other token that is not any of the above [^\s(),]+ # match any other token that is not any of the above
)/x', $tag_args, $match); )/x', $tag_args, $match);
@@ -1094,6 +1094,7 @@ class Smarty_Compiler extends Smarty {
case 'server': case 'server':
case 'session': case 'session':
case 'request': case 'request':
case 'capture':
return null; return null;
default: default: