Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
D
Drupal Environment
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Package registry
Model registry
Operate
Terraform modules
Monitor
Service Desk
Analyze
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
Composer
plugin
Drupal Environment
Commits
308a26ed
Commit
308a26ed
authored
4 months ago
by
danielspeicher
Browse files
Options
Downloads
Patches
Plain Diff
drupal/demos/salles#64
parent
d8df9c4a
No related branches found
Branches containing commit
No related tags found
Tags containing commit
1 merge request
!365
Merging develop into main
Changes
4
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
patches/d10-3.json
+0
-3
0 additions, 3 deletions
patches/d10-3.json
patches/d10-4.json
+0
-3
0 additions, 3 deletions
patches/d10-4.json
patches/d10/3478278.diff
+0
-14
0 additions, 14 deletions
patches/d10/3478278.diff
patches/d11.json
+0
-3
0 additions, 3 deletions
patches/d11.json
with
0 additions
and
23 deletions
patches/d10-3.json
+
0
−
3
View file @
308a26ed
...
...
@@ -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"
},
...
...
This diff is collapsed.
Click to expand it.
patches/d10-4.json
+
0
−
3
View file @
308a26ed
...
...
@@ -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"
},
...
...
This diff is collapsed.
Click to expand it.
patches/d10/3478278.diff
deleted
100644 → 0
+
0
−
14
View file @
d8df9c4a
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;
}
}
This diff is collapsed.
Click to expand it.
patches/d11.json
+
0
−
3
View file @
308a26ed
...
...
@@ -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"
},
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment