Security update for Core, with self-updated composer

[yaffs-website] / web / core / modules / image / src / Form / ImageStyleEditForm.php

diff --git a/web/core/modules/image/src/Form/ImageStyleEditForm.php b/web/core/modules/image/src/Form/ImageStyleEditForm.php
index 574d9145a8b954fc4a0fba4b6548103d0dbf6f64..53d40da232b103e27f52f46f9aac24fc190f2b52 100644 (file)
--- a/web/core/modules/image/src/Form/ImageStyleEditForm.php
+++ b/web/core/modules/image/src/Form/ImageStyleEditForm.php
@@ -2,6 +2,7 @@
 
 namespace Drupal\image\Form;
 
+use Drupal\Component\Utility\Unicode;
 use Drupal\Core\Entity\EntityStorageInterface;
 use Drupal\Core\Form\FormStateInterface;
 use Drupal\Core\Url;
@@ -58,7 +59,7 @@ class ImageStyleEditForm extends ImageStyleFormBase {
     $form['preview'] = [
       '#type' => 'item',
       '#title' => $this->t('Preview'),
-      '#markup' => drupal_render($preview_arguments),
+      '#markup' => \Drupal::service('renderer')->render($preview_arguments),
       // Render preview above parent elements.
       '#weight' => -5,
     ];
@@ -143,7 +144,7 @@ class ImageStyleEditForm extends ImageStyleFormBase {
     $new_effect_options = [];
     $effects = $this->imageEffectManager->getDefinitions();
     uasort($effects, function ($a, $b) {
-      return strcasecmp($a['id'], $b['id']);
+      return Unicode::strcasecmp($a['label'], $b['label']);
     });
     foreach ($effects as $effect => $definition) {
       $new_effect_options[$effect] = $definition['label'];