Index: branches/RC/core/kernel/utility/email_send.php =================================================================== diff -u -r9247 -r10098 --- branches/RC/core/kernel/utility/email_send.php (.../email_send.php) (revision 9247) +++ branches/RC/core/kernel/utility/email_send.php (.../email_send.php) (revision 10098) @@ -165,8 +165,8 @@ */ function GetFilenameExtension($filename) { - $last_dot = strrpos($filename, '.'); - return $last_dot !== false ? substr($filename, $last_dot + 1) : ''; + $last_dot = mb_strrpos($filename, '.'); + return $last_dot !== false ? mb_substr($filename, $last_dot + 1) : ''; } /** @@ -878,7 +878,7 @@ */ function guessContentType($filename, &$content_type, &$encoding) { - $file_extension = strtolower( $this->GetFilenameExtension($filename) ); + $file_extension = mb_strtolower( $this->GetFilenameExtension($filename) ); $mapping = '(xls:application/excel)(hqx:application/macbinhex40)(doc,dot,wrd:application/msword)(pdf:application/pdf) (pgp:application/pgp)(ps,eps,ai:application/postscript)(ppt:application/powerpoint)(rtf:application/rtf) @@ -1698,8 +1698,8 @@ */ function ExtractRecipientName($text, $email = '') { - $lastspace = strrpos($text, ' '); - $name = trim(substr($text, 0, $lastspace - strlen($text)), " \r\n\t\0\x0b\"'"); + $lastspace = mb_strrpos($text, ' '); + $name = trim(mb_substr($text, 0, $lastspace - mb_strlen($text)), " \r\n\t\0\x0b\"'"); if (empty($name)) { $name = $email; }