Updated Drupal to 8.6. This goes with the following updates because it's possible...

[yaffs-website] / web / core / lib / Drupal / Core / Mail / MailFormatHelper.php

diff --git a/web/core/lib/Drupal/Core/Mail/MailFormatHelper.php b/web/core/lib/Drupal/Core/Mail/MailFormatHelper.php
index ca63ca040e0d7197012f8aa7205bebea438895dc..431c846ceec9ec7347c77c7967f25572c765d8e4 100644 (file)
--- a/web/core/lib/Drupal/Core/Mail/MailFormatHelper.php
+++ b/web/core/lib/Drupal/Core/Mail/MailFormatHelper.php
@@ -3,7 +3,6 @@
 namespace Drupal\Core\Mail;
 
 use Drupal\Component\Utility\Html;
-use Drupal\Component\Utility\Unicode;
 use Drupal\Component\Utility\Xss;
 use Drupal\Core\Site\Settings;
 
@@ -222,12 +221,12 @@ class MailFormatHelper {
           // Fancy headers.
           case 'h1':
             $indent[] = '======== ';
-            $casing = '\Drupal\Component\Utility\Unicode::strtoupper';
+            $casing = 'mb_strtoupper';
             break;
 
           case 'h2':
             $indent[] = '-------- ';
-            $casing = '\Drupal\Component\Utility\Unicode::strtoupper';
+            $casing = 'mb_strtoupper';
             break;
 
           case '/h1':
@@ -260,7 +259,7 @@ class MailFormatHelper {
         // Convert inline HTML text to plain text; not removing line-breaks or
         // white-space, since that breaks newlines when sanitizing plain-text.
         $value = trim(Html::decodeEntities($value));
-        if (Unicode::strlen($value)) {
+        if (mb_strlen($value)) {
           $chunk = $value;
         }
       }