WordPress-C
/
WordPress
mirror of https://github.com/WordPress/WordPress.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Administration: Output valid HTML when `wp_die()` is called. 

To better support HTML and string calls to `wp_die()` without
outputting invalid HTML, wraps error messages in `<div>` rather than `<p>`.

Adds `.wp-die-message` CSS class for styling.

Props dinhtungdu, jeremyfelt, audrasjb, SergeyBiryukov, afercia, audrasjb, noisysocks.
Fixes #47580.
Built from https://develop.svn.wordpress.org/trunk@45909


git-svn-id: http://core.svn.wordpress.org/trunk@45720 1a063a9b-81f0-0310-95a4-ce76da25c4cd
This commit is contained in:
Mike Schroder 2019-08-29 07:54:01 +00:00
parent 6057b32e9b
commit ccdc221b32
6 changed files with 22 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
wp-admin/css/common-rtl.css
View File

@ -460,6 +460,12 @@ code {
white-space: nowrap; white-space: nowrap;
} }
.wp-die-message {
font-size: 13px;
line-height: 1.5;
margin: 1em 0;
}
/* .widefat - main style for tables */ /* .widefat - main style for tables */
.widefat { .widefat {
border-spacing: 0; border-spacing: 0;

2
wp-admin/css/common-rtl.min.css vendored
View File

File diff suppressed because one or more lines are too long

6
wp-admin/css/common.css
View File

@ -460,6 +460,12 @@ code {
white-space: nowrap; white-space: nowrap;
} }
.wp-die-message {
font-size: 13px;
line-height: 1.5;
margin: 1em 0;
}
/* .widefat - main style for tables */ /* .widefat - main style for tables */
.widefat { .widefat {
border-spacing: 0; border-spacing: 0;

2
wp-admin/css/common.min.css vendored
View File

File diff suppressed because one or more lines are too long

10
wp-includes/functions.php
View File

@ -3191,9 +3191,12 @@ function _default_wp_die_handler( $message, $title = '', $args = array() ) {
wp_list_pluck( $parsed_args['additional_errors'], 'message' ) wp_list_pluck( $parsed_args['additional_errors'], 'message' )
); );
$message = "<ul>\n\t\t<li>" . join( "</li>\n\t\t<li>", $message ) . "</li>\n\t</ul>"; $message = "<ul>\n\t\t<li>" . join( "</li>\n\t\t<li>", $message ) . "</li>\n\t</ul>";
} else {
$message = "<p>$message</p>";
} }
$message = sprintf(
'<div class="wp-die-message">%s</div>',
$message
);
} }
$have_gettext = function_exists( '__' ); $have_gettext = function_exists( '__' );
@ -3263,7 +3266,8 @@ function _default_wp_die_handler( $message, $title = '', $args = array() ) {
#error-page { #error-page {
margin-top: 50px; margin-top: 50px;
} }
#error-page p { #error-page p,
#error-page .wp-die-message {
font-size: 14px; font-size: 14px;
line-height: 1.5; line-height: 1.5;
margin: 25px 0 20px; margin: 25px 0 20px;

2
wp-includes/version.php
View File

@ -13,7 +13,7 @@
* *
* @global string $wp_version * @global string $wp_version
*/ */
$wp_version = '5.3-alpha-45908'; $wp_version = '5.3-alpha-45909';
/** /**
* Holds the WordPress DB revision, increments when changes are made to the WordPress DB schema. * Holds the WordPress DB revision, increments when changes are made to the WordPress DB schema.