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

remove unneeded preg_match

Browse Source
This commit is contained in:
mohrt
2001-02-10 23:58:51 +00:00
parent 43739c19a2
commit 0b5da4185e
2 changed files with 4 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
Smarty.class.php
View File

@@ -510,8 +510,6 @@ class Smarty
/* Split content by template tags to obtain non-template content. */ /* Split content by template tags to obtain non-template content. */
$text_blocks = preg_split("!{$ldq}.*?{$rdq}!s", $template_contents); $text_blocks = preg_split("!{$ldq}.*?{$rdq}!s", $template_contents);
$special_tags = preg_match_all('!(<\?[^?]*?\?>)!i',$text_blocks,$sp_match);
/* TODO: speed up the following with preg_replace and /F once we require that version of PHP */ /* TODO: speed up the following with preg_replace and /F once we require that version of PHP */
/* loop through text blocks */ /* loop through text blocks */
@@ -521,11 +519,11 @@ class Smarty
/* found at least one match, loop through each one */ /* found at least one match, loop through each one */
foreach($sp_match[0] as $curr_sp) { foreach($sp_match[0] as $curr_sp) {
if(!$this->allow_php) { if(!$this->allow_php) {
/* we don't allow php, so echo anything in <? ?> */ /* we don't allow php, so echo everything */
$text_blocks[$curr_tb] = str_replace($curr_sp,'<?php echo \''.str_replace("'","\'",$curr_sp).'\'; ?>',$text_blocks[$curr_tb]); $text_blocks[$curr_tb] = str_replace($curr_sp,'<?php echo \''.str_replace("'","\'",$curr_sp).'\'; ?>',$text_blocks[$curr_tb]);
} }
elseif(!preg_match("!^(<\?(php | )|<script\s*language\s*=\s*[\"\']?php[\"\']?\s*>)!i",$curr_sp)) elseif(!preg_match("!^(<\?(php | )|<script\s*language\s*=\s*[\"\']?php[\"\']?\s*>)!i",$curr_sp))
/* we allow php, so echo only non-php such as <?xml ?> */ /* we allow php, so echo only non-php tags */
$text_blocks[$curr_tb] = str_replace($curr_sp,'<?php echo \''.str_replace("'","\'",$curr_sp).'\'; ?>',$text_blocks[$curr_tb]); $text_blocks[$curr_tb] = str_replace($curr_sp,'<?php echo \''.str_replace("'","\'",$curr_sp).'\'; ?>',$text_blocks[$curr_tb]);
} }
} }

6
libs/Smarty.class.php
View File

@@ -510,8 +510,6 @@ class Smarty
/* Split content by template tags to obtain non-template content. */ /* Split content by template tags to obtain non-template content. */
$text_blocks = preg_split("!{$ldq}.*?{$rdq}!s", $template_contents); $text_blocks = preg_split("!{$ldq}.*?{$rdq}!s", $template_contents);
$special_tags = preg_match_all('!(<\?[^?]*?\?>)!i',$text_blocks,$sp_match);
/* TODO: speed up the following with preg_replace and /F once we require that version of PHP */ /* TODO: speed up the following with preg_replace and /F once we require that version of PHP */
/* loop through text blocks */ /* loop through text blocks */
@@ -521,11 +519,11 @@ class Smarty
/* found at least one match, loop through each one */ /* found at least one match, loop through each one */
foreach($sp_match[0] as $curr_sp) { foreach($sp_match[0] as $curr_sp) {
if(!$this->allow_php) { if(!$this->allow_php) {
/* we don't allow php, so echo anything in <? ?> */ /* we don't allow php, so echo everything */
$text_blocks[$curr_tb] = str_replace($curr_sp,'<?php echo \''.str_replace("'","\'",$curr_sp).'\'; ?>',$text_blocks[$curr_tb]); $text_blocks[$curr_tb] = str_replace($curr_sp,'<?php echo \''.str_replace("'","\'",$curr_sp).'\'; ?>',$text_blocks[$curr_tb]);
} }
elseif(!preg_match("!^(<\?(php | )|<script\s*language\s*=\s*[\"\']?php[\"\']?\s*>)!i",$curr_sp)) elseif(!preg_match("!^(<\?(php | )|<script\s*language\s*=\s*[\"\']?php[\"\']?\s*>)!i",$curr_sp))
/* we allow php, so echo only non-php such as <?xml ?> */ /* we allow php, so echo only non-php tags */
$text_blocks[$curr_tb] = str_replace($curr_sp,'<?php echo \''.str_replace("'","\'",$curr_sp).'\'; ?>',$text_blocks[$curr_tb]); $text_blocks[$curr_tb] = str_replace($curr_sp,'<?php echo \''.str_replace("'","\'",$curr_sp).'\'; ?>',$text_blocks[$curr_tb]);
} }
} }