From 9981e23d793ba9d3f20cd6ad2d3ea0c7a7b6a8fd Mon Sep 17 00:00:00 2001
From: "joseph.olstad" <joseph.olstad@1321830.no-reply.drupal.org>
Date: Fri, 7 Mar 2025 16:17:11 -0500
Subject: [PATCH 1/2] Issue #3161212 by asubit, eduardo morales alberti,
 sandeepsingh199: Node add/edit gives a Call to a member function
 getAccountName() on null Drupal 11

---
 core/modules/node/src/NodeForm.php | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/core/modules/node/src/NodeForm.php b/core/modules/node/src/NodeForm.php
index ab81a4e3f928..9eb9487b224f 100644
--- a/core/modules/node/src/NodeForm.php
+++ b/core/modules/node/src/NodeForm.php
@@ -139,6 +139,11 @@ public function form(array $form, FormStateInterface $form_state) {
 
     $form['advanced']['#attributes']['class'][] = 'entity-meta';
 
+    // Set default author.
+    $meta_author = \Drupal::currentUser()->getAccountName();
+    if (!$node->isNew() && $node->getOwner() != null) {
+      $meta_author = $node->getOwner()->getAccountName();
+    }
     $form['meta'] = [
       '#type' => 'details',
       '#group' => 'advanced',
@@ -163,7 +168,7 @@ public function form(array $form, FormStateInterface $form_state) {
     $form['meta']['author'] = [
       '#type' => 'item',
       '#title' => $this->t('Author'),
-      '#markup' => $node->getOwner()->getAccountName(),
+      '#markup' => $meta_author,
       '#wrapper_attributes' => ['class' => ['entity-meta__author']],
     ];
 
-- 
GitLab


From 8f98fa8b400c4ecb5c9939673f5b9267b506c4bf Mon Sep 17 00:00:00 2001
From: "joseph.olstad" <joseph.olstad@1321830.no-reply.drupal.org>
Date: Fri, 7 Mar 2025 16:29:11 -0500
Subject: [PATCH 2/2] Issue #3161212 by joseph.olstad: A phpcs fix for previous
 commit.

---
 core/modules/node/src/NodeForm.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/core/modules/node/src/NodeForm.php b/core/modules/node/src/NodeForm.php
index 9eb9487b224f..2ba26cab1bf5 100644
--- a/core/modules/node/src/NodeForm.php
+++ b/core/modules/node/src/NodeForm.php
@@ -141,7 +141,7 @@ public function form(array $form, FormStateInterface $form_state) {
 
     // Set default author.
     $meta_author = \Drupal::currentUser()->getAccountName();
-    if (!$node->isNew() && $node->getOwner() != null) {
+    if (!$node->isNew() && $node->getOwner() != NULL) {
       $meta_author = $node->getOwner()->getAccountName();
     }
     $form['meta'] = [
-- 
GitLab