Skip to content
Snippets Groups Projects
Commit 01d2ac85 authored by jurgenhaas's avatar jurgenhaas
Browse files

drupal-config#2 Move default config and patches to the new...

drupal-config#2 Move default config and patches to the new project composer/plugin/drupal-config
parent 412609f7
No related branches found
No related tags found
1 merge request!382Merging develop into main
Pipeline #1383945 passed
Showing
with 0 additions and 6464 deletions
diff --git a/core/modules/system/src/Plugin/Condition/RequestPath.php b/core/modules/system/src/Plugin/Condition/RequestPath.php
index 796277986b8cbbb18da7c8db77cdb44a1daa87cd..968d962401021fbf7182bf74021973e94fb62c42 100644
--- a/core/modules/system/src/Plugin/Condition/RequestPath.php
+++ b/core/modules/system/src/Plugin/Condition/RequestPath.php
@@ -149,6 +149,11 @@ public function evaluate() {
$request = $this->requestStack->getCurrentRequest();
// Compare the lowercase path alias (if any) and internal path.
$path = $this->currentPath->getPath($request);
+ // Remove multiple slashes as they can only be there by mistake.
+ $count = -1;
+ while ($count !== 0) {
+ $path = str_replace('//', '/', $path, $count);
+ }
// Do not trim a trailing slash if that is the complete path.
$path = $path === '/' ? $path : rtrim($path, '/');
$path_alias = mb_strtolower($this->aliasManager->getAliasByPath($path));
This diff is collapsed.
This diff is collapsed.
diff --git a/src/Plugin/Field/FieldWidget/EntityGroupFieldWidgetBase.php b/src/Plugin/Field/FieldWidget/EntityGroupFieldWidgetBase.php
--- a/src/Plugin/Field/FieldWidget/EntityGroupFieldWidgetBase.php
+++ b/src/Plugin/Field/FieldWidget/EntityGroupFieldWidgetBase.php
@@ -861,1 +861,1 @@ abstract class EntityGroupFieldWidgetBase extends WidgetBase implements Containe
- $selected_group = NestedArray::getValue($form_state->getValues(), $parent_keys);
+ if ($selected_group = NestedArray::getValue($form_state->getValues(), $parent_keys)) {
@@ -862,1 +862,1 @@ abstract class EntityGroupFieldWidgetBase extends WidgetBase implements Containe
- $group = \Drupal::entityTypeManager()->getStorage('group')->load($selected_group);
+ if ($group = \Drupal::entityTypeManager()->getStorage('group')->load($selected_group)) {
@@ -869,1 +869,1 @@ abstract class EntityGroupFieldWidgetBase extends WidgetBase implements Containe
- // Clearing relation field.
+ }}// Clearing relation field.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment