projects
/
civicrm-core.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge pull request #12265 from agileware/Accessibility-Issue-9
[civicrm-core.git]
/
CRM
/
Utils
/
String.php
diff --git
a/CRM/Utils/String.php
b/CRM/Utils/String.php
index be6ba732a99f56dcc35b549f14640b90f145df09..2225befa961d23e52465e0e1ac13c2a98b4c55cd 100644
(file)
--- a/
CRM/Utils/String.php
+++ b/
CRM/Utils/String.php
@@
-1,9
+1,9
@@
<?php
/*
+--------------------------------------------------------------------+
<?php
/*
+--------------------------------------------------------------------+
- | CiviCRM version
4.7
|
+ | CiviCRM version
5
|
+--------------------------------------------------------------------+
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-201
7
|
+ | Copyright CiviCRM LLC (c) 2004-201
8
|
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
@@
-28,7
+28,7
@@
/**
*
* @package CRM
/**
*
* @package CRM
- * @copyright CiviCRM LLC (c) 2004-201
7
+ * @copyright CiviCRM LLC (c) 2004-201
8
*/
require_once 'HTML/QuickForm/Rule/Email.php';
*/
require_once 'HTML/QuickForm/Rule/Email.php';
@@
-657,13
+657,13
@@
class CRM_Utils_String {
* @return string
*/
public static function ellipsify($string, $maxLen) {
* @return string
*/
public static function ellipsify($string, $maxLen) {
- $len =
strlen($string
);
+ $len =
mb_strlen($string, 'UTF-8'
);
if ($len <= $maxLen) {
return $string;
}
else {
$end = $maxLen - 3;
if ($len <= $maxLen) {
return $string;
}
else {
$end = $maxLen - 3;
- while (
strlen($string
) > $maxLen - 3) {
+ while (
mb_strlen($string, 'UTF-8'
) > $maxLen - 3) {
$string = mb_substr($string, 0, $end, 'UTF-8');
$end = $end - 1;
}
$string = mb_substr($string, 0, $end, 'UTF-8');
$end = $end - 1;
}