Update to Smarty 2.6.22

This commit is contained in:
anubis
2009-01-04 17:34:22 -05:00
parent eedd737a97
commit 60b674c776
18 changed files with 473 additions and 216 deletions

View File

@@ -21,7 +21,7 @@
function smarty_modifier_capitalize($string, $uc_digits = false)
{
smarty_modifier_capitalize_ucfirst(null, $uc_digits);
return preg_replace_callback('!\b\w+\b!', 'smarty_modifier_capitalize_ucfirst', $string);
return preg_replace_callback('!\'?\b\w(\w|\')*\b!', 'smarty_modifier_capitalize_ucfirst', $string);
}
function smarty_modifier_capitalize_ucfirst($string, $uc_digits = null)
@@ -33,7 +33,7 @@ function smarty_modifier_capitalize_ucfirst($string, $uc_digits = null)
return;
}
if(!preg_match('!\d!',$string[0]) || $_uc_digits)
if(substr($string[0],0,1) != "'" && !preg_match("!\d!",$string[0]) || $_uc_digits)
return ucfirst($string[0]);
else
return $string[0];