Verified Commit 62a402a3 authored by Alex Pott's avatar Alex Pott
Browse files

Issue #3301663 by catch, Berdir, lucassc: Remove handling of node_type... 

Issue #3301663 by catch, Berdir, lucassc: Remove handling of node_type condition plugin in BlockForm::\Drupal\block\BlockForm::buildVisibilityInterface()

(cherry picked from commit 61e1fecc)
parent 41052d27

core/modules/block/src/BlockForm.php

+0 −16
Original line number Diff line number Diff line
@@ -237,15 +237,6 @@ protected function buildVisibilityInterface(array $form, FormStateInterface $for 
        continue;

      }



      // Don't display the deprecated node type condition unless it has existing

      // settings.

      // @todo Make this more generic in

      //   https://www.drupal.org/project/drupal/issues/2922451. Also remove

      //   the node_type specific logic below.

      if ($condition_id == 'node_type' && !isset($visibility[$condition_id])) {

        continue;

      }



      /** @var \Drupal\Core\Condition\ConditionInterface $condition */

      $condition = $this->manager->createInstance($condition_id, $visibility[$condition_id] ?? []);

      $form_state->set(['conditions', $condition_id], $condition);
@@ -256,13 +247,6 @@ protected function buildVisibilityInterface(array $form, FormStateInterface $for 
      $form[$condition_id] = $condition_form;

    }



    if (isset($form['node_type'])) {

      $form['node_type']['#title'] = $this->t('Content types (deprecated)');

      $form['node_type']['bundles']['#title'] = $this->t('Content types');

      $form['node_type']['negate']['#type'] = 'value';

      $form['node_type']['negate']['#title_display'] = 'invisible';

      $form['node_type']['negate']['#value'] = $form['node_type']['negate']['#default_value'];

    }

    if (isset($form['entity_bundle:node'])) {

      $form['entity_bundle:node']['negate']['#type'] = 'value';

      $form['entity_bundle:node']['negate']['#title_display'] = 'invisible';