php/yii2
1
0
Fork 0
mirror of https://github.com/yiisoft/yii2.git synced 2025-08-14 14:28:27 +08:00
Code Issues Packages Projects Releases Wiki Activity

Update BaseStringHelper.php

Browse Source
This commit is contained in:
Alex-Code
2014-04-22 10:01:03 +01:00
parent 4bec5fe748
commit ca6583a045
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
framework/helpers/BaseStringHelper.php
View File

@ -98,7 +98,7 @@ class BaseStringHelper
*/
public static function truncate($string, $length, $suffix = '...', $encoding = null)
{
if (mb_strlen($string) > $length) {
if (mb_strlen($string, $encoding ?: \Yii::$app->charset) > $length) {
return trim(mb_substr($string, 0, $length, $encoding ?: \Yii::$app->charset)) . $suffix;
} else {
return $string;
@ -114,7 +114,7 @@ class BaseStringHelper
*/
public static function truncateWords($string, $count, $suffix = '...')
{
$words = preg_split('/(\s+)/', trim($string), null, PREG_SPLIT_DELIM_CAPTURE);
$words = preg_split('/(\s+)/u', trim($string), null, PREG_SPLIT_DELIM_CAPTURE);
if (count($words) / 2 > $count) {
return implode('', array_slice($words, 0, ($count * 2) - 1)) . $suffix;
} else {