Users: Restore spacing between the messages on Edit User screen.

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.

git-svn-id: https://develop.svn.wordpress.org/trunk@58581 602fd350-edb4-49c9-b593-d223f7449a82

src/wp-admin/edit-tag-form.php

@@ -77,7 +77,11 @@
 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,

src/wp-admin/user-edit.php

@@ -214,19 +214,24 @@
 
  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,
  array(
  'id' => 'message',
  'dismissible' => true,
  'additional_classes' => array( 'updated' ),
+ 'paragraph_wrap' => false,
  )
  );
  endif;