Commit c2f61df0 authored by catch's avatar catch
Browse files

Issue #3514262 by berdir, smustgrave, xjm, quietone:... 

Issue #3514262 by berdir, smustgrave, xjm, quietone: entity_browser_entity_form_field_widget_third_party_settings_form hooks can no longer return NULL

(cherry picked from commit 2cecb7b3)
parent d847fe00

core/modules/field_ui/src/Form/EntityFormDisplayEditForm.php

+2 −2
Original line number Diff line number Diff line
@@ -127,13 +127,13 @@ protected function thirdPartySettingsForm(PluginSettingsInterface $plugin, Field 
    $this->moduleHandler->invokeAllWith(

      'field_widget_third_party_settings_form',

      function (callable $hook, string $module) use (&$settings_form, $plugin, $field_definition, &$form, $form_state) {

        $settings_form[$module] = ($settings_form[$module] ?? []) + $hook(

        $settings_form[$module] = ($settings_form[$module] ?? []) + ($hook(

          $plugin,

          $field_definition,

          $this->entity->getMode(),

          $form,

          $form_state

        );

        ) ?? []);

      }

    );

    return $settings_form;

core/modules/field_ui/src/Form/EntityViewDisplayEditForm.php

+2 −2
Original line number Diff line number Diff line
@@ -162,13 +162,13 @@ protected function thirdPartySettingsForm(PluginSettingsInterface $plugin, Field 
    $this->moduleHandler->invokeAllWith(

      'field_formatter_third_party_settings_form',

      function (callable $hook, string $module) use (&$settings_form, &$plugin, &$field_definition, &$form, &$form_state) {

        $settings_form[$module] = ($settings_form[$module] ?? []) + $hook(

        $settings_form[$module] = ($settings_form[$module] ?? []) + ($hook(

          $plugin,

          $field_definition,

          $this->entity->getMode(),

          $form,

          $form_state,

        );

        )) ?? [];

      }

    );

    return $settings_form;