diff --git a/patches/d10-3.json b/patches/d10-3.json index 05a09e624d37143761b2e9c4b10f18bd6a63f69e..aa39589b54660bc4699d1cd8573ef19d5b35a8b4 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 6a023373a6cb384a16aa6231b9d0b6c12ac7c29a..89558005d920dd225db55266470cebf82dcd0bb9 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 c8a4b163dbd7bdb17301246d63e9aadbdb3544f6..0000000000000000000000000000000000000000 --- 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 6d3ac7c9243fb3c11ddbc5c96b31a2ed4663acf0..ec032caa32009c1323bfcc8a2276c8f1c742000c 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" },