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

Make it possible to unregister pre/postfilter plugins.

Browse Source
This commit is contained in:
andrei
2002-04-05 17:16:52 +00:00
parent 360fbad56a
commit ba8a7a6115
5 changed files with 27 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
NEWS
View File

@@ -1,4 +1,6 @@
- added htmlall attribute to escape (Monte) - added ability to unregister pre/postfilters plugins at
runtime. (Andrei)
- added 'htmlall' attribute to escape modifier. (Monte)
- added template_exists() API function. (Andrei) - added template_exists() API function. (Andrei)
- fixed a problem with using dynamic values for 'file' - fixed a problem with using dynamic values for 'file'
attribute of {include_php} tag. (Andrei) attribute of {include_php} tag. (Andrei)

10
Smarty.class.php
View File

@@ -370,7 +370,10 @@ class Smarty
\*======================================================================*/ \*======================================================================*/
function unregister_prefilter($function) function unregister_prefilter($function)
{ {
unset($this->_plugins['prefilter'][$function]); if (isset($this->_plugins['prefilter'][$function]))
unset($this->_plugins['prefilter'][$function]);
else
$this->_plugins['prefilter'][$function] = false;
} }
/*======================================================================*\ /*======================================================================*\
@@ -390,7 +393,10 @@ class Smarty
\*======================================================================*/ \*======================================================================*/
function unregister_postfilter($function) function unregister_postfilter($function)
{ {
unset($this->_plugins['postfilter'][$function]); if (isset($this->_plugins['postfilter'][$function]))
unset($this->_plugins['postfilter'][$function]);
else
$this->_plugins['postfilter'][$function] = false;
} }
/*======================================================================*\ /*======================================================================*\

5
Smarty_Compiler.class.php
View File

@@ -80,6 +80,7 @@ class Smarty_Compiler extends Smarty {
// run template source through prefilter functions // run template source through prefilter functions
if (count($this->_plugins['prefilter']) > 0) { if (count($this->_plugins['prefilter']) > 0) {
foreach ($this->_plugins['prefilter'] as $filter_name => $prefilter) { foreach ($this->_plugins['prefilter'] as $filter_name => $prefilter) {
if ($prefilter === false) continue;
if ($prefilter[3] || function_exists($prefilter[0])) { if ($prefilter[3] || function_exists($prefilter[0])) {
$template_source = $prefilter[0]($template_source, $this); $template_source = $prefilter[0]($template_source, $this);
$this->_plugins['prefilter'][$filter_name][3] = true; $this->_plugins['prefilter'][$filter_name][3] = true;
@@ -176,6 +177,7 @@ class Smarty_Compiler extends Smarty {
// run compiled template through postfilter functions // run compiled template through postfilter functions
if (count($this->_plugins['postfilter']) > 0) { if (count($this->_plugins['postfilter']) > 0) {
foreach ($this->_plugins['postfilter'] as $filter_name => $postfilter) { foreach ($this->_plugins['postfilter'] as $filter_name => $postfilter) {
if ($postfilter === false) continue;
if ($postfilter[3] || function_exists($postfilter[0])) { if ($postfilter[3] || function_exists($postfilter[0])) {
$template_compiled = $postfilter[0]($template_compiled, $this); $template_compiled = $postfilter[0]($template_compiled, $this);
$this->_plugins['postfilter'][$filter_name][3] = true; $this->_plugins['postfilter'][$filter_name][3] = true;
@@ -1366,7 +1368,8 @@ class Smarty_Compiler extends Smarty {
$parts[2] != 'php' || $parts[2] != 'php' ||
($parts[0] != 'prefilter' && ($parts[0] != 'prefilter' &&
$parts[0] != 'postfilter') || $parts[0] != 'postfilter') ||
isset($this->_plugins[$parts[0]][$parts[1]])) (isset($this->_plugins[$parts[0]][$parts[1]]) &&
$this->_plugins[$parts[0]][$parts[1]] === false))
continue; continue;
$plugin_file = $plugins_dir . '/' . $entry; $plugin_file = $plugins_dir . '/' . $entry;

10
libs/Smarty.class.php
View File

@@ -370,7 +370,10 @@ class Smarty
\*======================================================================*/ \*======================================================================*/
function unregister_prefilter($function) function unregister_prefilter($function)
{ {
unset($this->_plugins['prefilter'][$function]); if (isset($this->_plugins['prefilter'][$function]))
unset($this->_plugins['prefilter'][$function]);
else
$this->_plugins['prefilter'][$function] = false;
} }
/*======================================================================*\ /*======================================================================*\
@@ -390,7 +393,10 @@ class Smarty
\*======================================================================*/ \*======================================================================*/
function unregister_postfilter($function) function unregister_postfilter($function)
{ {
unset($this->_plugins['postfilter'][$function]); if (isset($this->_plugins['postfilter'][$function]))
unset($this->_plugins['postfilter'][$function]);
else
$this->_plugins['postfilter'][$function] = false;
} }
/*======================================================================*\ /*======================================================================*\

5
libs/Smarty_Compiler.class.php
View File

@@ -80,6 +80,7 @@ class Smarty_Compiler extends Smarty {
// run template source through prefilter functions // run template source through prefilter functions
if (count($this->_plugins['prefilter']) > 0) { if (count($this->_plugins['prefilter']) > 0) {
foreach ($this->_plugins['prefilter'] as $filter_name => $prefilter) { foreach ($this->_plugins['prefilter'] as $filter_name => $prefilter) {
if ($prefilter === false) continue;
if ($prefilter[3] || function_exists($prefilter[0])) { if ($prefilter[3] || function_exists($prefilter[0])) {
$template_source = $prefilter[0]($template_source, $this); $template_source = $prefilter[0]($template_source, $this);
$this->_plugins['prefilter'][$filter_name][3] = true; $this->_plugins['prefilter'][$filter_name][3] = true;
@@ -176,6 +177,7 @@ class Smarty_Compiler extends Smarty {
// run compiled template through postfilter functions // run compiled template through postfilter functions
if (count($this->_plugins['postfilter']) > 0) { if (count($this->_plugins['postfilter']) > 0) {
foreach ($this->_plugins['postfilter'] as $filter_name => $postfilter) { foreach ($this->_plugins['postfilter'] as $filter_name => $postfilter) {
if ($postfilter === false) continue;
if ($postfilter[3] || function_exists($postfilter[0])) { if ($postfilter[3] || function_exists($postfilter[0])) {
$template_compiled = $postfilter[0]($template_compiled, $this); $template_compiled = $postfilter[0]($template_compiled, $this);
$this->_plugins['postfilter'][$filter_name][3] = true; $this->_plugins['postfilter'][$filter_name][3] = true;
@@ -1366,7 +1368,8 @@ class Smarty_Compiler extends Smarty {
$parts[2] != 'php' || $parts[2] != 'php' ||
($parts[0] != 'prefilter' && ($parts[0] != 'prefilter' &&
$parts[0] != 'postfilter') || $parts[0] != 'postfilter') ||
isset($this->_plugins[$parts[0]][$parts[1]])) (isset($this->_plugins[$parts[0]][$parts[1]]) &&
$this->_plugins[$parts[0]][$parts[1]] === false))
continue; continue;
$plugin_file = $plugins_dir . '/' . $entry; $plugin_file = $plugins_dir . '/' . $entry;