Verified Commit cb2e043f authored by Lee Rowlands's avatar Lee Rowlands
Browse files

Issue #315176 by Dave Reid, andypost, franz, sun, Alan D.: Clean-up remains of... 

Issue #315176 by Dave Reid, andypost, franz, sun, Alan D.: Clean-up remains of $form['array_filter'] hack with array_filter in book module

(cherry picked from commit 65b6ffc9)
parent 67c0d6b8

core/modules/book/src/Form/BookSettingsForm.php

+2 −3
Original line number Diff line number Diff line
@@ -47,7 +47,6 @@ public function buildForm(array $form, FormStateInterface $form_state) { 
      '#options' => $types,

      '#required' => TRUE,

    ];

    $form['array_filter'] = ['#type' => 'value', '#value' => TRUE];



    return parent::buildForm($form, $form_state);

  }
@@ -56,7 +55,7 @@ public function buildForm(array $form, FormStateInterface $form_state) { 
   * {@inheritdoc}

   */

  public function validateForm(array &$form, FormStateInterface $form_state) {

    $child_type = $form_state->getValue('book_child_type');

    $child_type = array_filter($form_state->getValue('book_child_type'));

    if ($form_state->isValueEmpty(['book_allowed_types', $child_type])) {

      $form_state->setErrorByName('book_child_type', $this->t('The content type for the %add-child link must be one of those selected as an allowed book outline type.', ['%add-child' => $this->t('Add child page')]));

    }
@@ -76,7 +75,7 @@ public function submitForm(array &$form, FormStateInterface $form_state) { 
    $this->config('book.settings')

    // Remove unchecked types.

      ->set('allowed_types', $allowed_types)

      ->set('child_type', $form_state->getValue('book_child_type'))

      ->set('child_type', array_filter($form_state->getValue('book_child_type')))

      ->save();



    parent::submitForm($form, $form_state);