Updated to Smarty 2.6.26 (June 18th, 2009), we should update to Smarty 3.x (current...

[mirrors/Kyberia-bloodline.git] / wwwroot / smarty / libs / plugins / modifier.capitalize.php

diff --git a/wwwroot/smarty/libs/plugins/modifier.capitalize.php b/wwwroot/smarty/libs/plugins/modifier.capitalize.php
index 3600589d507efaa8a9abc4d18a68c8d777921cf9..4a611d9f0f225524ab3d82f6ba81085105a1a61b 100644 (file)
--- a/wwwroot/smarty/libs/plugins/modifier.capitalize.php
+++ b/wwwroot/smarty/libs/plugins/modifier.capitalize.php
@@ -14,25 +14,26 @@
  * Purpose:  capitalize words in the string
  * @link http://smarty.php.net/manual/en/language.modifiers.php#LANGUAGE.MODIFIER.CAPITALIZE
  *      capitalize (Smarty online manual)
+ * @author   Monte Ohrt <monte at ohrt dot com>
  * @param string
  * @return string
  */
 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)
 {
     static $_uc_digits = false;
-
+    
     if(isset($uc_digits)) {
         $_uc_digits = $uc_digits;
         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];