From c15614f3cb98e528f54937b0ddbfd716c8769239 Mon Sep 17 00:00:00 2001
From: Sergey Biryukov <sergeybiryukov.ru@gmail.com>
Date: Wed, 26 Jun 2024 15:23:14 +0000
Subject: [PATCH] Users: Restore spacing between the messages on Edit User
 screen.
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Includes restoring paragraph tags for “User updated” and “← Go to Users” messages, so that the arrow is not on the same line as the previous message.

Follow-up to [56570].

Props Presskopp, narenin, swissspidy, SergeyBiryukov.
Fixes #61506.
Built from https://develop.svn.wordpress.org/trunk@58581


git-svn-id: http://core.svn.wordpress.org/trunk@58028 1a063a9b-81f0-0310-95a4-ce76da25c4cd
---
 wp-admin/edit-tag-form.php |  6 +++++-
 wp-admin/user-edit.php     | 11 ++++++++---
 wp-includes/version.php    |  2 +-
 3 files changed, 14 insertions(+), 5 deletions(-)

diff --git a/wp-admin/edit-tag-form.php b/wp-admin/edit-tag-form.php
index ba2e187de4..0b59e36c84 100644
--- a/wp-admin/edit-tag-form.php
+++ b/wp-admin/edit-tag-form.php
@@ -77,7 +77,11 @@ $class = ( isset( $msg ) && 5 === $msg ) ? 'error' : 'success';
 if ( $message ) {
 	$message = '<p><strong>' . $message . '</strong></p>';
 	if ( $wp_http_referer ) {
-		$message .= '<p><a href="' . esc_url( wp_validate_redirect( sanitize_url( $wp_http_referer ), admin_url( 'term.php?taxonomy=' . $taxonomy ) ) ) . '">' . esc_html( $tax->labels->back_to_items ) . '</a></p>';
+		$message .= sprintf(
+			'<p><a href="%1$s">%2$s</a></p>',
+			esc_url( wp_validate_redirect( sanitize_url( $wp_http_referer ), admin_url( 'term.php?taxonomy=' . $taxonomy ) ) ),
+			esc_html( $tax->labels->back_to_items )
+		);
 	}
 	wp_admin_notice(
 		$message,
diff --git a/wp-admin/user-edit.php b/wp-admin/user-edit.php
index 0ab9aec48f..f66a54d85f 100644
--- a/wp-admin/user-edit.php
+++ b/wp-admin/user-edit.php
@@ -214,12 +214,16 @@ switch ( $action ) {
 
 		if ( isset( $_GET['updated'] ) ) :
 			if ( IS_PROFILE_PAGE ) :
-				$message = '<strong>' . __( 'Profile updated.' ) . '</strong>';
+				$message = '<p><strong>' . __( 'Profile updated.' ) . '</strong></p>';
 			else :
-				$message = '<strong>' . __( 'User updated.' ) . '</strong>';
+				$message = '<p><strong>' . __( 'User updated.' ) . '</strong></p>';
 			endif;
 			if ( $wp_http_referer && ! str_contains( $wp_http_referer, 'user-new.php' ) && ! IS_PROFILE_PAGE ) :
-				$message .= '<a href="' . esc_url( wp_validate_redirect( sanitize_url( $wp_http_referer ), self_admin_url( 'users.php' ) ) ) . '">' . __( '&larr; Go to Users' ) . '</a>';
+				$message .= sprintf(
+					'<p><a href="%1$s">%2$s</a></p>',
+					esc_url( wp_validate_redirect( sanitize_url( $wp_http_referer ), self_admin_url( 'users.php' ) ) ),
+					__( '&larr; Go to Users' )
+				);
 			endif;
 			wp_admin_notice(
 				$message,
@@ -227,6 +231,7 @@ switch ( $action ) {
 					'id'                 => 'message',
 					'dismissible'        => true,
 					'additional_classes' => array( 'updated' ),
+					'paragraph_wrap'     => false,
 				)
 			);
 		endif;
diff --git a/wp-includes/version.php b/wp-includes/version.php
index c47b61021b..7d229473a5 100644
--- a/wp-includes/version.php
+++ b/wp-includes/version.php
@@ -16,7 +16,7 @@
  *
  * @global string $wp_version
  */
-$wp_version = '6.7-alpha-58580';
+$wp_version = '6.7-alpha-58581';
 
 /**
  * Holds the WordPress DB revision, increments when changes are made to the WordPress DB schema.