X-Git-Url: https://git.sur5r.net/?a=blobdiff_plain;f=smarty%2Fplugins%2Fmodifier.capitalize.php;h=4a611d9f0f225524ab3d82f6ba81085105a1a61b;hb=fdc0d8d266386b90091ff6ad423244f746edb424;hp=bca951a08bc39c652bb167cbcf6dd9e8372a9a55;hpb=6f3a0c8c1a1e0ded813fc79568ef096312a51267;p=contagged

diff --git a/smarty/plugins/modifier.capitalize.php b/smarty/plugins/modifier.capitalize.php
index bca951a..4a611d9 100644
--- a/smarty/plugins/modifier.capitalize.php
+++ b/smarty/plugins/modifier.capitalize.php
@@ -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];