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

- bugfix on some compiling modifiers

Browse Source
This commit is contained in:
uwe.tews@googlemail.com
2010-09-25 13:31:57 +00:00
parent 802d40f3d3
commit dde2219004
5 changed files with 8 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
change_log.txt
View File

@@ -1,3 +1,6 @@
25/09/2010
- bugfix on some compiling modifiers
24/09/2010
- bugfix merge_compiled_includes flag was not restored correctly in {block} tag

4
libs/plugins/modifiercompiler.count_characters.php
View File

@@ -24,9 +24,9 @@ function smarty_modifiercompiler_count_characters($params, $compiler)
if (function_exists('mb_strlen')) {
// count also spaces?
if (isset($params[1]) && $params[1] == 'true') {
return '(mb_detect_encoding(' . $params[0] . ', \'UTF-8, ISO-8859-1\') === \'UTF-8\') ? mb_strlen(' . $params[0] . ', SMARTY_RESOURCE_CHAR_SET) : strlen(' . $params[0] . ')';
return '((mb_detect_encoding(' . $params[0] . ', \'UTF-8, ISO-8859-1\') === \'UTF-8\') ? mb_strlen(' . $params[0] . ', SMARTY_RESOURCE_CHAR_SET) : strlen(' . $params[0] . '))';
}
return '(mb_detect_encoding(' . $params[0] . ', \'UTF-8, ISO-8859-1\') === \'UTF-8\') ? preg_match_all(\'#[^\s\pZ]#u\', ' . $params[0] . ', $tmp) : preg_match_all(\'/[^\s]/\',' . $params[0] . ', $tmp)';
return '((mb_detect_encoding(' . $params[0] . ', \'UTF-8, ISO-8859-1\') === \'UTF-8\') ? preg_match_all(\'#[^\s\pZ]#u\', ' . $params[0] . ', $tmp) : preg_match_all(\'/[^\s]/\',' . $params[0] . ', $tmp))';
} else {
// count also spaces?
if (isset($params[1]) && $params[1] == 'true') {

2
libs/plugins/modifiercompiler.count_words.php
View File

@@ -22,7 +22,7 @@ function smarty_modifiercompiler_count_words($params, $compiler)
{
// mb_ functions available?
if (function_exists('mb_strlen')) {
return '(mb_detect_encoding(' . $params[0] . ', \'UTF-8, ISO-8859-1\') === \'UTF-8\') ? preg_match_all(\'#[\w\pL]+#u\', ' . $params[0] . ', $tmp) : preg_match_all(\'#\w+#\',' . $params[0] . ', $tmp)';
return '((mb_detect_encoding(' . $params[0] . ', \'UTF-8, ISO-8859-1\') === \'UTF-8\') ? preg_match_all(\'#[\w\pL]+#u\', ' . $params[0] . ', $tmp) : preg_match_all(\'#\w+#\',' . $params[0] . ', $tmp))';
} else {
return 'str_word_count(' . $params[0] . ')';
}

2
libs/plugins/modifiercompiler.lower.php
View File

@@ -22,7 +22,7 @@
function smarty_modifiercompiler_lower($params, $compiler)
{
if (function_exists('mb_strtolower')) {
return '(mb_detect_encoding(' . $params[0] . ', \'UTF-8, ISO-8859-1\') === \'UTF-8\') ? mb_strtolower(' . $params[0] . ',SMARTY_RESOURCE_CHAR_SET) : strtolower(' . $params[0] . ')' ;
return '((mb_detect_encoding(' . $params[0] . ', \'UTF-8, ISO-8859-1\') === \'UTF-8\') ? mb_strtolower(' . $params[0] . ',SMARTY_RESOURCE_CHAR_SET) : strtolower(' . $params[0] . '))' ;
} else {
return 'strtolower(' . $params[0] . ')';
}

2
libs/plugins/modifiercompiler.upper.php
View File

@@ -21,7 +21,7 @@
function smarty_modifiercompiler_upper($params, $compiler)
{
if (function_exists('mb_strtoupper')) {
return '(mb_detect_encoding(' . $params[0] . ', \'UTF-8, ISO-8859-1\') === \'UTF-8\') ? mb_strtoupper(' . $params[0] . ',SMARTY_RESOURCE_CHAR_SET) : strtoupper(' . $params[0] . ')' ;
return '((mb_detect_encoding(' . $params[0] . ', \'UTF-8, ISO-8859-1\') === \'UTF-8\') ? mb_strtoupper(' . $params[0] . ',SMARTY_RESOURCE_CHAR_SET) : strtoupper(' . $params[0] . '))' ;
} else {
return 'strtoupper(' . $params[0] . ')';
}