From 61e1feccf856bce9bf3203f264bee20007c59fcc Mon Sep 17 00:00:00 2001
From: Alex Pott <alex.a.pott@googlemail.com>
Date: Wed, 10 Aug 2022 16:59:14 +0100
Subject: [PATCH] Issue #3301663 by catch, Berdir, lucassc: Remove handling of
node_type condition plugin in
BlockForm::\Drupal\block\BlockForm::buildVisibilityInterface()
---
core/modules/block/src/BlockForm.php | 16 ----------------
1 file changed, 16 deletions(-)
diff --git a/core/modules/block/src/BlockForm.php b/core/modules/block/src/BlockForm.php
index 172186a84e86..902c6827cae7 100644
--- a/core/modules/block/src/BlockForm.php
+++ b/core/modules/block/src/BlockForm.php
@@ -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';
--
GitLab