From be4ad8548cb0c099d10191fe8ee0d6554284d58d Mon Sep 17 00:00:00 2001
From: Sergey Biryukov <sergeybiryukov.ru@gmail.com>
Date: Sat, 29 Aug 2020 00:42:05 +0000
Subject: [PATCH] Administration: Correct the padding for "Warning: these pages
 should not be the same" messages on Reading Settings screen.

Replace the legacy `.error` class with a more appropriate `.notice-warning`.

Props musicaljoeker, shital-patel, man4toman, garrett-eclipse, SergeyBiryukov.
Fixes #50766.
Built from https://develop.svn.wordpress.org/trunk@48906


git-svn-id: http://core.svn.wordpress.org/trunk@48668 1a063a9b-81f0-0310-95a4-ce76da25c4cd
---
 wp-admin/options-reading.php | 4 ++--
 wp-includes/version.php      | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/wp-admin/options-reading.php b/wp-admin/options-reading.php
index 94ba93501a..39d5645673 100644
--- a/wp-admin/options-reading.php
+++ b/wp-admin/options-reading.php
@@ -137,10 +137,10 @@ else :
 </label></li>
 </ul>
 	<?php if ( 'page' === get_option( 'show_on_front' ) && get_option( 'page_for_posts' ) === get_option( 'page_on_front' ) ) : ?>
-	<div id="front-page-warning" class="error inline"><p><?php _e( '<strong>Warning:</strong> these pages should not be the same!' ); ?></p></div>
+	<div id="front-page-warning" class="notice notice-warning inline"><p><?php _e( '<strong>Warning:</strong> these pages should not be the same!' ); ?></p></div>
 	<?php endif; ?>
 	<?php if ( get_option( 'wp_page_for_privacy_policy' ) === get_option( 'page_for_posts' ) || get_option( 'wp_page_for_privacy_policy' ) === get_option( 'page_on_front' ) ) : ?>
-	<div id="privacy-policy-page-warning" class="error inline"><p><?php _e( '<strong>Warning:</strong> these pages should not be the same as your Privacy Policy page!' ); ?></p></div>
+	<div id="privacy-policy-page-warning" class="notice notice-warning inline"><p><?php _e( '<strong>Warning:</strong> these pages should not be the same as your Privacy Policy page!' ); ?></p></div>
 	<?php endif; ?>
 </fieldset></td>
 </tr>
diff --git a/wp-includes/version.php b/wp-includes/version.php
index 279eef3c10..851be88fe9 100644
--- a/wp-includes/version.php
+++ b/wp-includes/version.php
@@ -13,7 +13,7 @@
  *
  * @global string $wp_version
  */
-$wp_version = '5.6-alpha-48905';
+$wp_version = '5.6-alpha-48906';
 
 /**
  * Holds the WordPress DB revision, increments when changes are made to the WordPress DB schema.