From ea33cc211e2505edac93c1d2f9189e17e1b95a03 Mon Sep 17 00:00:00 2001
From: catch <6915-catch@users.noreply.drupalcode.org>
Date: Tue, 11 Feb 2025 15:11:34 +0000
Subject: [PATCH] Issue #3469116 by prashant.c, pameeela, kostask, shalini_jha,
sagarmohite0031, benjifisher, mrdalesmith, smustgrave, kristiaanvandeneynde,
quietone, b_sharpe, nod_: Logout confirmation form shows inappropriate
confirmation description
---
core/modules/user/src/Form/UserLogoutConfirm.php | 8 ++++++++
core/modules/user/tests/src/Functional/UserLogoutTest.php | 3 +++
2 files changed, 11 insertions(+)
diff --git a/core/modules/user/src/Form/UserLogoutConfirm.php b/core/modules/user/src/Form/UserLogoutConfirm.php
index df2b1e27eb10..c681db62e059 100644
--- a/core/modules/user/src/Form/UserLogoutConfirm.php
+++ b/core/modules/user/src/Form/UserLogoutConfirm.php
@@ -22,6 +22,14 @@ public function getConfirmText(): TranslatableMarkup {
return $this->t('Log out');
}
+ /**
+ * {@inheritdoc}
+ */
+ public function getDescription() {
+ // phpcs:ignore Drupal.Semantics.FunctionT.EmptyString
+ return $this->t('');
+ }
+
/**
* {@inheritdoc}
*/
diff --git a/core/modules/user/tests/src/Functional/UserLogoutTest.php b/core/modules/user/tests/src/Functional/UserLogoutTest.php
index 952b15b0711f..5630ff1f527c 100644
--- a/core/modules/user/tests/src/Functional/UserLogoutTest.php
+++ b/core/modules/user/tests/src/Functional/UserLogoutTest.php
@@ -50,6 +50,9 @@ public function testLogout(): void {
$this->drupalGet($logoutUrl, ['query' => ['token' => '123']]);
$this->assertTrue($this->drupalUserIsLoggedIn($account));
$this->assertSession()->addressEquals($confirmUrl);
+ // Test to ensure the text 'This action cannot be undone.' is not
+ // present on the page.
+ $this->assertSession()->pageTextNotContains('This action cannot be undone.');
// Submitting the confirmation form correctly logs the user out.
$this->submitForm([], 'Log out');
$this->assertFalse($this->drupalUserIsLoggedIn($account));
--
GitLab