From 308a26ed6c1b4f4a95d55d37c7f15e221cec5849 Mon Sep 17 00:00:00 2001 From: Daniel Speicher <daniel.speicher@lakedrops.com> Date: Fri, 29 Nov 2024 09:25:42 +0100 Subject: [PATCH] drupal/demos/salles#64 --- patches/d10-3.json | 3 --- patches/d10-4.json | 3 --- patches/d10/3478278.diff | 14 -------------- patches/d11.json | 3 --- 4 files changed, 23 deletions(-) delete mode 100644 patches/d10/3478278.diff diff --git a/patches/d10-3.json b/patches/d10-3.json index e140076..de7a8a5 100644 --- a/patches/d10-3.json +++ b/patches/d10-3.json @@ -149,9 +149,6 @@ "drupal/menu_block": { "#3082445 Add option to always render parent menu item": "https://www.drupal.org/files/issues/2020-10-12/menu_block-render-parent-3082445-26.patch" }, - "drupal/name": { - "#3478278 Name and IEF": "https://gitlab.lakedrops.com/composer/plugin/drupal-environment/-/raw/main/patches/d10/3478278.diff" - }, "drupal/pdfpreview": { "#local debug": "https://gitlab.lakedrops.com/composer/plugin/drupal-environment/-/raw/main/patches/pdfpreview-debug.diff" }, diff --git a/patches/d10-4.json b/patches/d10-4.json index 2320c24..312e6aa 100644 --- a/patches/d10-4.json +++ b/patches/d10-4.json @@ -149,9 +149,6 @@ "drupal/menu_block": { "#3082445 Add option to always render parent menu item": "https://www.drupal.org/files/issues/2020-10-12/menu_block-render-parent-3082445-26.patch" }, - "drupal/name": { - "#3478278 Name and IEF": "https://gitlab.lakedrops.com/composer/plugin/drupal-environment/-/raw/main/patches/d10/3478278.diff" - }, "drupal/pdfpreview": { "#local debug": "https://gitlab.lakedrops.com/composer/plugin/drupal-environment/-/raw/main/patches/pdfpreview-debug.diff" }, diff --git a/patches/d10/3478278.diff b/patches/d10/3478278.diff deleted file mode 100644 index c8a4b16..0000000 --- a/patches/d10/3478278.diff +++ /dev/null @@ -1,14 +0,0 @@ -diff --git a/name.module b/name.module -index 25b1d1149d96d9597ca6f42a9edb42f3d03ea4a3..866af4d5aaa14d430b9a67bc4a9fb65112776360 100644 ---- a/name.module -+++ b/name.module -@@ -144,7 +144,8 @@ function name_user_format_name_alter_preload($account) { - $field_name = Drupal::config('name.settings')->get('user_preferred'); - if ($field_name && FieldConfig::loadByName('user', 'user', $field_name)) { - $in_preload = TRUE; -- $account = User::load($account->id()); -+ $id = $account->id(); -+ $account = $id ? User::load($id) : 'unknown'; - $in_preload = FALSE; - } - } diff --git a/patches/d11.json b/patches/d11.json index c878243..1841398 100644 --- a/patches/d11.json +++ b/patches/d11.json @@ -146,9 +146,6 @@ "drupal/menu_block": { "#3082445 Add option to always render parent menu item": "https://www.drupal.org/files/issues/2020-10-12/menu_block-render-parent-3082445-26.patch" }, - "drupal/name": { - "#3478278 Name and IEF": "https://gitlab.lakedrops.com/composer/plugin/drupal-environment/-/raw/main/patches/d10/3478278.diff" - }, "drupal/pdfpreview": { "#local debug": "https://gitlab.lakedrops.com/composer/plugin/drupal-environment/-/raw/main/patches/pdfpreview-debug.diff" }, -- GitLab