diff options
author | friendica <info@friendica.com> | 2014-12-12 00:28:46 -0800 |
---|---|---|
committer | friendica <info@friendica.com> | 2014-12-12 00:28:46 -0800 |
commit | b30ea4c2c51f893bf0cffbea38e875cb01c6c431 (patch) | |
tree | 07c6f125256c73bfa29fe2dfed0f601def167adc /library/Smarty/libs/plugins/shared.literal_compiler_param.php | |
parent | d3465802d6433bcd4cf24971951e0633161b0665 (diff) | |
parent | 967ab871b836f618107fe144978bd1453c3c6634 (diff) | |
download | volse-hubzilla-b30ea4c2c51f893bf0cffbea38e875cb01c6c431.tar.gz volse-hubzilla-b30ea4c2c51f893bf0cffbea38e875cb01c6c431.tar.bz2 volse-hubzilla-b30ea4c2c51f893bf0cffbea38e875cb01c6c431.zip |
Merge https://github.com/friendica/red into pending_merge
Diffstat (limited to 'library/Smarty/libs/plugins/shared.literal_compiler_param.php')
-rw-r--r-- | library/Smarty/libs/plugins/shared.literal_compiler_param.php | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/library/Smarty/libs/plugins/shared.literal_compiler_param.php b/library/Smarty/libs/plugins/shared.literal_compiler_param.php index dbcd9374c..47d728a76 100644 --- a/library/Smarty/libs/plugins/shared.literal_compiler_param.php +++ b/library/Smarty/libs/plugins/shared.literal_compiler_param.php @@ -2,7 +2,7 @@ /** * Smarty plugin * - * @package Smarty + * @package Smarty * @subpackage PluginsShared */ @@ -12,22 +12,24 @@ * @param array $params parameter array as given to the compiler function * @param integer $index array index of the parameter to convert * @param mixed $default value to be returned if the parameter is not present + * * @return mixed evaluated value of parameter or $default * @throws SmartyException if parameter is not a literal (but an expression, variable, …) * @author Rodney Rehm */ -function smarty_literal_compiler_param($params, $index, $default=null) +function smarty_literal_compiler_param($params, $index, $default = null) { // not set, go default if (!isset($params[$index])) { return $default; } // test if param is a literal - if (!preg_match('/^([\'"]?)[a-zA-Z0-9]+(\\1)$/', $params[$index])) { + if (!preg_match('/^([\'"]?)[a-zA-Z0-9-]+(\\1)$/', $params[$index])) { throw new SmartyException('$param[' . $index . '] is not a literal and is thus not evaluatable at compile time'); } $t = null; eval("\$t = " . $params[$index] . ";"); + return $t; } |