Issue #3501085 by richardgaunt, fionamorrison23, nidhish, joshua1234511: images with 'image style' should have relative link (#1404)

Author: joshua-salsadigital

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

@@ -76,6 +76,10 @@ settings:
         - '<figure class data-component-id>'
         - '<div class>'
         - '<iframe width height src title allowfullscreen>'
+        - '<video controls class width height>'
+        - '<source src type>'
+        - '<a hreflang target title data-dialog-type data-dialog-options class="ct-content-link ct-content-link--external use-ajax ct-button--button ct-button--prompt ct-button--link ct-promo__button ct-theme-dark">'
+        - '<table class="ct-theme-dark">'
     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> <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>'
+      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 use-ajax ct-button--button ct-button--prompt ct-button--link ct-promo__button ct-theme-dark" href data-entity-type data-entity-uuid data-entity-substitution hreflang target title data-dialog-type data-dialog-options> <table class="ct-theme-light ct-table ct-table--striped ct-theme-dark"> <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> <video controls class width height> <source src type> <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,7 +76,6 @@ filters:
     weight: 0
     settings:
       title: true
-      media_substitution: metadata
   media_embed:
     id: media_embed
     provider: media

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

@@ -33,7 +33,8 @@ function civictheme_preprocess_media__civictheme_image(array &$variables): void
     if ($image->isValid()) {
       $variables['width'] = $image->getWidth();
       $variables['height'] = $image->getHeight();
-      $variables['url'] = \Drupal::service('file_url_generator')->transformRelative($image_file->getFileUri());
+      $image_url = \Drupal::service('file_url_generator')->generateString($image_file->getFileUri());
+      $variables['url'] = \Drupal::service('file_url_generator')->transformRelative($image_url);
       $variables['alt'] = $media->get('field_c_m_image')->first()->get('alt')->getString();
       $variables['caption'] = $media->get('field_c_m_caption')->getString();
     }

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

@@ -180,7 +180,8 @@ function civictheme_media_image_get_variables(MediaInterface $media, ?string $im
   }
 
   $url = civictheme_media_image_get_url($media, $image_style);
-  $variables['url'] = \Drupal::service('file_url_generator')->transformRelative($url);
+  $image_url = \Drupal::service('file_url_generator')->generateString($url);
+  $variables['url'] = \Drupal::service('file_url_generator')->transformRelative($image_url);
 
   $image = $media
     ->get($media->getSource()->getConfiguration()['source_field'])