Unverified Commit 69345ad8 authored by Lee Rowlands's avatar Lee Rowlands
Browse files

Issue #3136406 by Spokje, codersukanta, IJsbrandy, atul4drupal, MahtabAlam,... 

Issue #3136406 by Spokje, codersukanta, IJsbrandy, atul4drupal, MahtabAlam, BalajiDS: Argument 1 passed to Drupal\Core\Form\SubformState::createForSubform() must be of the type array, null given

(cherry picked from commit acb4b855)
parent 115b2547

core/modules/editor/editor.module

+3 −1
Original line number Diff line number Diff line
@@ -247,7 +247,9 @@ function editor_form_filter_admin_format_submit($form, FormStateInterface $form_ 
    $original_editor->delete();

  }



  if ($editor_plugin = $form_state->get('editor_plugin')) {

  $editor_set = $form_state->getValue(['editor', 'editor']) !== "";

  $subform_array_exists = (!empty($form['editor']['settings']['subform']) && is_array($form['editor']['settings']['subform']));

  if (($editor_plugin = $form_state->get('editor_plugin')) && $editor_set && $subform_array_exists) {

    $subform_state = SubformState::createForSubform($form['editor']['settings']['subform'], $form, $form_state);

    $editor_plugin->submitConfigurationForm($form['editor']['settings']['subform'], $subform_state);

  }

core/modules/editor/tests/src/Functional/EditorAdminTest.php

+17 −0
Original line number Diff line number Diff line
@@ -155,6 +155,23 @@ public function testDisableFormatWithEditor() { 
    $this->assertRaw($text);

  }



  /**

   * Tests switching text editor to none does not throw a TypeError.

   */

  public function testSwitchEditorToNone() {

    $this->enableUnicornEditor();

    $this->drupalLogin($this->adminUser);

    $this->drupalGet('admin/config/content/formats/manage/filtered_html');

    $edit = $this->selectUnicornEditor();



    // Switch editor to 'None'.

    $edit = [

      'editor[editor]' => '',

    ];

    $this->submitForm($edit, 'Configure');

    $this->submitForm($edit, 'Save configuration');

  }



  /**

   * Adds an editor to a new format using the UI.

   *