Merge pull request #12935 from jensschuppe/core-412

[dev/core#412] Avoid truncated UTF-8 strings when using substr()
civicrm · Oct 18, 2018 · 51ffa35 · 51ffa35
2 parents 739e971 + e429c35
commit 51ffa35
Showing 1 changed file with 1 addition and 3 deletions.
diff --git a/CRM/Core/BAO/Mapping.php b/CRM/Core/BAO/Mapping.php
@@ -997,9 +997,7 @@ public static function getCustomGroupName($customfieldId) {
       $customGroupId = CRM_Core_DAO::getFieldValue('CRM_Core_DAO_CustomField', $customFieldId, 'custom_group_id');
       $customGroupName = CRM_Core_DAO::getFieldValue('CRM_Core_DAO_CustomGroup', $customGroupId, 'title');
 
-      if (strlen($customGroupName) > 13) {
-        $customGroupName = substr($customGroupName, 0, 10) . '...';
-      }
+      $customGroupName = CRM_Utils_String::ellipsify($customGroupName, 13);
 
       return $customGroupName;
     }