diff --git a/core/modules/block/src/BlockBase.php b/core/modules/block/src/BlockBase.php index 7af838b..258d23d 100644 --- a/core/modules/block/src/BlockBase.php +++ b/core/modules/block/src/BlockBase.php @@ -346,7 +346,6 @@ public function validateConfigurationForm(array &$form, array &$form_state) { 'values' => &$form_state['values']['visibility'][$condition_id], ); $condition->validateConfigurationForm($form, $condition_values); - } $this->blockValidate($form, $form_state); diff --git a/core/modules/block/src/BlockPluginInterface.php b/core/modules/block/src/BlockPluginInterface.php index 64fd12f..9f3090a 100644 --- a/core/modules/block/src/BlockPluginInterface.php +++ b/core/modules/block/src/BlockPluginInterface.php @@ -145,7 +145,7 @@ public function getMachineNameSuggestion(); * Gets conditions for this block. * * @return \Drupal\Core\Condition\ConditionInterface[]|\Drupal\Core\Condition\ConditionPluginBag - * An array of configured condition plugins. + * An array or bag of configured condition plugins. */ public function getVisibilityConditions(); diff --git a/core/modules/block/tests/src/BlockBaseTest.php b/core/modules/block/tests/src/BlockBaseTest.php index c036e15..575a6fb 100644 --- a/core/modules/block/tests/src/BlockBaseTest.php +++ b/core/modules/block/tests/src/BlockBaseTest.php @@ -64,9 +64,9 @@ public function testGetMachineNameSuggestion() { } /** - * Tests initialising the condition plugins initialisation. + * Tests initializing the condition plugins initialization. */ - public function testCondtionsBagInitialisation() { + public function testConditionsBagInitialization() { $plugin_manager = $this->getMock('Drupal\Core\Executable\ExecutableManagerInterface'); $plugin_manager->expects($this->once()) ->method('getDefinitions')