Merge branch 'develop' into feature/3526953-ckeditor-figure

Author: joshua-salsadigital

web/themes/contrib/civictheme/config/install/editor.editor.civictheme_rich_text.yml

@@ -73,6 +73,9 @@ settings:
         - '<h5 id>'
         - '<h6 id>'
         - '<drupal-media title>'
+        - '<figure class data-component-id>'
+        - '<div class>'
+        - '<iframe width height src title allowfullscreen>'
     ckeditor5_style:
       styles:
         -

web/themes/contrib/civictheme/config/install/filter.format.civictheme_rich_text.yml

@@ -41,7 +41,7 @@ filters:
     status: true
     weight: -50
     settings:
-      allowed_html: '<br> <p class="ct-text-large ct-text-small text-align-left text-align-center text-align-right"> <h2 id class> <h3 id class="text-align-left text-align-center text-align-right"> <h4 id class="text-align-left text-align-center text-align-right"> <h5 id class="text-align-left text-align-center text-align-right"> <h6 id class="text-align-left text-align-center text-align-right"> <a class="ct-button ct-theme-light ct-button--primary ct-button--regular ct-button--secondary ct-button--large ct-content-link ct-content-link--external ct-button--button ct-theme-dark" hreflang target title href data-entity-type data-entity-uuid data-entity-substitution> <table class="ct-theme-light ct-table ct-table--striped"> <cite> <dl> <dt> <dd> <img src alt data-entity-type data-entity-uuid> <drupal-entity alt title data-entity-type data-entity-uuid data-entity-embed-display data-entity-embed-display-settings data-align data-caption data-embed-button> <span class="ct-visually-hidden"> <svg role viewbox aria-hidden width height class="ct-icon"> <path d> <blockquote cite> <ul type> <ol type start> <drupal-media title data-entity-type data-entity-uuid alt data-caption data-align> <strong> <em> <u> <s> <sub> <sup> <li> <tr> <td rowspan colspan> <th rowspan colspan> <thead> <tbody> <tfoot> <caption>'
+      allowed_html: '<br> <p class="ct-text-large ct-text-small text-align-left text-align-center text-align-right"> <h2 id class> <h3 id class="text-align-left text-align-center text-align-right"> <h4 id class="text-align-left text-align-center text-align-right"> <h5 id class="text-align-left text-align-center text-align-right"> <h6 id class="text-align-left text-align-center text-align-right"> <a class="ct-button ct-theme-light ct-button--primary ct-button--regular ct-button--secondary ct-button--large ct-content-link ct-content-link--external ct-button--button ct-theme-dark" hreflang target title href data-entity-type data-entity-uuid data-entity-substitution> <table class="ct-theme-light ct-table ct-table--striped"> <cite> <dl> <dt> <dd> <img src alt data-entity-type data-entity-uuid> <drupal-entity alt title data-entity-type data-entity-uuid data-entity-embed-display data-entity-embed-display-settings data-align data-caption data-embed-button> <span class="ct-visually-hidden"> <svg role viewbox aria-hidden width height class="ct-icon"> <path d> <blockquote cite> <ul type> <ol type start> <drupal-media title data-entity-type data-entity-uuid alt data-caption data-align> <figure class data-component-id> <div class> <iframe width height src title allowfullscreen> <strong> <em> <u> <s> <sub> <sup> <li> <tr> <td rowspan colspan> <th rowspan colspan> <thead> <tbody> <tfoot> <caption>'
       filter_html_help: true
       filter_html_nofollow: false
   filter_html_escape:
@@ -76,6 +76,7 @@ filters:
     weight: 0
     settings:
       title: true
+      media_substitution: metadata
   media_embed:
     id: media_embed
     provider: media

web/themes/contrib/civictheme/includes/link.inc

@@ -8,7 +8,6 @@
 declare(strict_types=1);
 
 use Drupal\Component\Utility\Html;
-use Drupal\filter\FilterPluginCollection;
 
 /**
  * Process HTML content to replace URLs with links.
@@ -23,12 +22,14 @@ function _civictheme_process_html_content_urls_to_links(string $html): string {
     return $html;
   }
 
-  // Convert URLs to links using core filter_url.
-  $filter_manager = \Drupal::service('plugin.manager.filter');
-  $filter_collection = new FilterPluginCollection($filter_manager, []);
-  $filter = $filter_collection->get('filter_url');
+  // Use Drupal's text format processing system.
+  $build = [
+    '#type' => 'processed_text',
+    '#text' => $html,
+    '#format' => 'civictheme_rich_text',
+  ];
 
-  return _filter_url($html, $filter);
+  return (string) \Drupal::service('renderer')->render($build);
 }
 
 /**