Updated Drupal to 8.6. This goes with the following updates because it's possible...

[yaffs-website] / web / core / modules / system / src / Form / ThemeSettingsForm.php

diff --git a/web/core/modules/system/src/Form/ThemeSettingsForm.php b/web/core/modules/system/src/Form/ThemeSettingsForm.php
index 03ded30b7d4d0ad6d9ca94d84db6b4a2e757267a..907e5ce3d2de1434d102de360a3b94c34a5433dd 100644 (file)
--- a/web/core/modules/system/src/Form/ThemeSettingsForm.php
+++ b/web/core/modules/system/src/Form/ThemeSettingsForm.php
@@ -136,11 +136,11 @@ class ThemeSettingsForm extends ConfigFormBase {
 
     $form['var'] = [
       '#type' => 'hidden',
-      '#value' => $var
+      '#value' => $var,
     ];
     $form['config_key'] = [
       '#type' => 'hidden',
-      '#value' => $config_key
+      '#value' => $config_key,
     ];
 
     // Toggle settings
@@ -377,22 +377,23 @@ class ThemeSettingsForm extends ConfigFormBase {
     parent::validateForm($form, $form_state);
 
     if ($this->moduleHandler->moduleExists('file')) {
-      $validators = ['file_validate_is_image' => []];
 
       // Check for a new uploaded logo.
-      $file = _file_save_upload_from_form($form['logo']['settings']['logo_upload'], $form_state, 0);
-      if ($file) {
-        // Put the temporary file in form_values so we can save it on submit.
-        $form_state->setValue('logo_upload', $file);
+      if (isset($form['logo'])) {
+        $file = _file_save_upload_from_form($form['logo']['settings']['logo_upload'], $form_state, 0);
+        if ($file) {
+          // Put the temporary file in form_values so we can save it on submit.
+          $form_state->setValue('logo_upload', $file);
+        }
       }
 
-      $validators = ['file_validate_extensions' => ['ico png gif jpg jpeg apng svg']];
-
       // Check for a new uploaded favicon.
-      $file = _file_save_upload_from_form($form['favicon']['settings']['favicon_upload'], $form_state, 0);
-      if ($file) {
-        // Put the temporary file in form_values so we can save it on submit.
-        $form_state->setValue('favicon_upload', $file);
+      if (isset($form['favicon'])) {
+        $file = _file_save_upload_from_form($form['favicon']['settings']['favicon_upload'], $form_state, 0);
+        if ($file) {
+          // Put the temporary file in form_values so we can save it on submit.
+          $form_state->setValue('favicon_upload', $file);
+        }
       }
 
       // When intending to use the default logo, unset the logo_path.