From fa10e0945ecd45bfe78a2c8fb015a43092b4944b Mon Sep 17 00:00:00 2001 From: plegall Date: Thu, 10 Dec 2015 14:02:22 +0100 Subject: bug #385 update to smarty-3.1.28-dev (from Github) --- .../libs/plugins/shared.escape_special_chars.php | 26 ++++++++++++---------- 1 file changed, 14 insertions(+), 12 deletions(-) (limited to 'include/smarty/libs/plugins/shared.escape_special_chars.php') diff --git a/include/smarty/libs/plugins/shared.escape_special_chars.php b/include/smarty/libs/plugins/shared.escape_special_chars.php index d2609b674..d3bd756b1 100644 --- a/include/smarty/libs/plugins/shared.escape_special_chars.php +++ b/include/smarty/libs/plugins/shared.escape_special_chars.php @@ -2,20 +2,21 @@ /** * Smarty shared plugin * - * @package Smarty + * @package Smarty * @subpackage PluginsShared */ if (version_compare(PHP_VERSION, '5.2.3', '>=')) { /** * escape_special_chars common function - * * Function: smarty_function_escape_special_chars
* Purpose: used by other smarty functions to escape * special chars except for already escaped ones * * @author Monte Ohrt - * @param string $string text that should by escaped + * + * @param string $string text that should by escaped + * * @return string */ function smarty_function_escape_special_chars($string) @@ -23,18 +24,20 @@ if (version_compare(PHP_VERSION, '5.2.3', '>=')) { if (!is_array($string)) { $string = htmlspecialchars($string, ENT_COMPAT, Smarty::$_CHARSET, false); } + return $string; - } -} else { + } +} else { /** * escape_special_chars common function - * * Function: smarty_function_escape_special_chars
* Purpose: used by other smarty functions to escape * special chars except for already escaped ones * * @author Monte Ohrt - * @param string $string text that should by escaped + * + * @param string $string text that should by escaped + * * @return string */ function smarty_function_escape_special_chars($string) @@ -42,10 +45,9 @@ if (version_compare(PHP_VERSION, '5.2.3', '>=')) { if (!is_array($string)) { $string = preg_replace('!&(#?\w+);!', '%%%SMARTY_START%%%\\1%%%SMARTY_END%%%', $string); $string = htmlspecialchars($string); - $string = str_replace(array('%%%SMARTY_START%%%', '%%%SMARTY_END%%%'), array('&', ';'), $string); + $string = str_replace(array('%%%SMARTY_START%%%', '%%%SMARTY_END%%%'), array('&', ';'), $string); } - return $string; - } -} -?> \ No newline at end of file + return $string; + } +} -- cgit v1.2.3