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

I18N: Respect the passed `text_direction` argument in `wp_die()`. 

Previously, the passed value was only used as a fallback if `get_language_attributes()` is not yet available.

Props apedog.
Fixes #49060.
Built from https://develop.svn.wordpress.org/trunk@48607


git-svn-id: http://core.svn.wordpress.org/trunk@48369 1a063a9b-81f0-0310-95a4-ce76da25c4cd
This commit is contained in:
Sergey Biryukov 2020-07-25 15:26:05 +00:00
parent d07fc084af
commit ed9d53ec1f
2 changed files with 12 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
wp-includes/functions.php
View File

@ -3286,6 +3286,8 @@ function wp_nonce_ays( $action ) {
* an integer to be used as the response code. * an integer to be used as the response code.
* @since 5.1.0 The `$link_url`, `$link_text`, and `$exit` arguments were added. * @since 5.1.0 The `$link_url`, `$link_text`, and `$exit` arguments were added.
* @since 5.3.0 The `$charset` argument was added. * @since 5.3.0 The `$charset` argument was added.
* @since 5.5.0 The `$text_direction` argument has a priority over get_language_attributes()
* in the default handler.
* *
* @global WP_Query $wp_query WordPress Query object. * @global WP_Query $wp_query WordPress Query object.
* *
@ -3306,8 +3308,8 @@ function wp_nonce_ays( $action ) {
* @type string $link_text A label for the link to include. Only works in combination with $link_url. * @type string $link_text A label for the link to include. Only works in combination with $link_url.
* Default empty string. * Default empty string.
* @type bool $back_link Whether to include a link to go back. Default false. * @type bool $back_link Whether to include a link to go back. Default false.
* @type string $text_direction The text direction. This is only useful internally, when WordPress * @type string $text_direction The text direction. This is only useful internally, when WordPress is still
* is still loading and the site's locale is not set up yet. Accepts 'rtl'. * loading and the site's locale is not set up yet. Accepts 'rtl' and 'ltr'.
* Default is the value of is_rtl(). * Default is the value of is_rtl().
* @type string $charset Character set of the HTML output. Default 'utf-8'. * @type string $charset Character set of the HTML output. Default 'utf-8'.
* @type string $code Error code to use. Default is 'wp_die', or the main error code if $message * @type string $code Error code to use. Default is 'wp_die', or the main error code if $message
@ -3443,10 +3445,14 @@ function _default_wp_die_handler( $message, $title = '', $args = array() ) {
} }
$text_direction = $parsed_args['text_direction']; $text_direction = $parsed_args['text_direction'];
if ( function_exists( 'language_attributes' ) && function_exists( 'is_rtl' ) ) { $dir_attr = "dir='$text_direction'";
// If `text_direction` was not explicitly passed,
// use get_language_attributes() if available.
if ( empty( $args['text_direction'] )
&& function_exists( 'language_attributes' ) && function_exists( 'is_rtl' )
) {
$dir_attr = get_language_attributes(); $dir_attr = get_language_attributes();
} else {
$dir_attr = "dir='$text_direction'";
} }
?> ?>
<!DOCTYPE html> <!DOCTYPE html>

2
wp-includes/version.php
View File

@ -13,7 +13,7 @@
* *
* @global string $wp_version * @global string $wp_version
*/ */
$wp_version = '5.5-beta3-48606'; $wp_version = '5.5-beta3-48607';
/** /**
* 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.