Verified Commit b6e28b8d authored by Dave Long's avatar Dave Long
Browse files

Merged 11.4.4.

parents 1d7d698c 1eabaf9e

core/lib/Drupal.php

+1 −1
Original line number Diff line number Diff line
@@ -76,7 +76,7 @@ class Drupal { 
  /**

   * The current system version.

   */

  const VERSION = '11.4.4-dev';

  const VERSION = '11.4.5-dev';



  /**

   * Core API compatibility.

core/lib/Drupal/Component/Utility/Xss.php

+2 −0
Original line number Diff line number Diff line
@@ -297,6 +297,8 @@ protected static function attributes($attributes) { 
            $skip = (

              in_array($attribute_name, ['style', 'srcdoc']) ||

              str_starts_with($attribute_name, 'on') ||

              str_starts_with($attribute_name, 'data-hx') ||

              str_starts_with($attribute_name, 'hx') ||

              str_starts_with($attribute_name, '-') ||

              // Ignore long attributes to avoid unnecessary processing

              // overhead.

core/modules/image/src/Controller/ImageStyleDownloadController.php

+9 −9
Original line number Diff line number Diff line
@@ -155,15 +155,15 @@ public function deliver(Request $request, $scheme, ImageStyleInterface $image_st 
      throw new AccessDeniedHttpException("The scheme for this image doesn't match the scheme for the original image");

    }



    if ($token_is_valid) {

      $is_public = ($scheme !== 'private');

    }

    else {

      $core_schemes = ['public', 'private', 'temporary'];

      $additional_public_schemes = array_diff(Settings::get('file_additional_public_schemes', []), $core_schemes);

      $public_schemes = array_merge(['public'], $additional_public_schemes);

      $is_public = in_array($derivative_scheme, $public_schemes, TRUE);

    }

    $additional_public_schemes = array_diff(

      Settings::get('file_additional_public_schemes', []),

      ['public', 'private', 'temporary'],

    );

    $is_public = in_array(

      $derivative_scheme,

      array_merge(['public'], $additional_public_schemes),

      TRUE,

    );



    $headers = [];

core/modules/layout_builder/js/layout-builder.js

+2 −2
Original line number Diff line number Diff line
@@ -445,9 +445,9 @@ 
    const contentPreviewPlaceholderLabel = document.createElement('div');

    contentPreviewPlaceholderLabel.className =

      'layout-builder-block__content-preview-placeholder-label js-layout-builder-content-preview-placeholder-label';

    contentPreviewPlaceholderLabel.innerHTML = contentPreviewPlaceholderText;

    contentPreviewPlaceholderLabel.textContent = contentPreviewPlaceholderText;



    return `<div class="layout-builder-block__content-preview-placeholder-label js-layout-builder-content-preview-placeholder-label">${contentPreviewPlaceholderText}</div>`;

    return contentPreviewPlaceholderLabel.outerHTML;

  };



  // Remove all contextual links outside the layout.