X-Git-Url: http://aleph1.co.uk/gitweb/?a=blobdiff_plain;f=web%2Fcore%2Fmodules%2Ffilter%2Fsrc%2FPlugin%2FFilter%2FFilterCaption.php;h=a03c95f5c8ca64f2a5635beb71525f6253b73d22;hb=0bf8d09d2542548982e81a441b1f16e75873a04f;hp=62c83950369b82b037a488ce710baba3cde45206;hpb=a2bd1bf0c2c1f1a17d188f4dc0726a45494cefae;p=yaffs-website

diff --git a/web/core/modules/filter/src/Plugin/Filter/FilterCaption.php b/web/core/modules/filter/src/Plugin/Filter/FilterCaption.php
index 62c839503..a03c95f5c 100644
--- a/web/core/modules/filter/src/Plugin/Filter/FilterCaption.php
+++ b/web/core/modules/filter/src/Plugin/Filter/FilterCaption.php
@@ -3,7 +3,6 @@
 namespace Drupal\filter\Plugin\Filter;
 
 use Drupal\Component\Utility\Html;
-use Drupal\Component\Utility\Unicode;
 use Drupal\Component\Utility\Xss;
 use Drupal\filter\FilterProcessResult;
 use Drupal\filter\Plugin\FilterBase;
@@ -43,7 +42,7 @@ class FilterCaption extends FilterBase {
         $caption = FilteredMarkup::create(Xss::filter($caption, ['a', 'em', 'strong', 'cite', 'code', 'br']));
 
         // The caption must be non-empty.
-        if (Unicode::strlen($caption) === 0) {
+        if (mb_strlen($caption) === 0) {
           continue;
         }
 
@@ -64,7 +63,7 @@ class FilterCaption extends FilterBase {
           '#caption' => $caption,
           '#classes' => $classes,
         ];
-        $altered_html = drupal_render($filter_caption);
+        $altered_html = \Drupal::service('renderer')->render($filter_caption);
 
         // Load the altered HTML into a new DOMDocument and retrieve the element.
         $updated_nodes = Html::load($altered_html)->getElementsByTagName('body')