Pull merge.

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

diff --git a/web/core/lib/Drupal/Core/GeneratedLink.php b/web/core/lib/Drupal/Core/GeneratedLink.php
index 09411876ed7b459b38f001cc2ff7370117967401..62f10a5df70b53868247c13a8dcd4bf1d060af07 100644 (file)
--- a/web/core/lib/Drupal/Core/GeneratedLink.php
+++ b/web/core/lib/Drupal/Core/GeneratedLink.php
@@ -3,7 +3,6 @@
 namespace Drupal\Core;
 
 use Drupal\Component\Render\MarkupInterface;
-use Drupal\Component\Utility\Unicode;
 use Drupal\Core\Render\BubbleableMetadata;
 
 /**
@@ -32,7 +31,7 @@ class GeneratedLink extends BubbleableMetadata implements MarkupInterface, \Coun
    * @return string
    */
   public function getGeneratedLink() {
-    return $this->generatedLink ;
+    return $this->generatedLink;
   }
 
   /**
@@ -66,7 +65,7 @@ class GeneratedLink extends BubbleableMetadata implements MarkupInterface, \Coun
    * {@inheritdoc}
    */
   public function count() {
-    return Unicode::strlen($this->__toString());
+    return mb_strlen($this->__toString());
   }
 
 }