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

I18N: Prevent fatal error in `WP_Textdomain_Registry`. 

Use `rtrim` instead of `untrailingslashit` and `trailingslashit` directly.

Avoids `formatting.php` dependency and thus prevents an error when called via `wp_load_translations_early()`, which happens e.g. when in maintenance mode.

Props grl570810, ocean90.
Fixes #57218.
Built from https://develop.svn.wordpress.org/trunk@55302


git-svn-id: http://core.svn.wordpress.org/trunk@54835 1a063a9b-81f0-0310-95a4-ce76da25c4cd
This commit is contained in:
Pascal Birchler 2023-02-09 16:35:22 +00:00
parent bc0c01b1ac
commit cb9f9d81b2
2 changed files with 9 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
wp-includes/class-wp-textdomain-registry.php
View File

@ -1,6 +1,9 @@
<?php <?php
/** /**
* Locale API: WP_Textdomain_Registry class * Locale API: WP_Textdomain_Registry class.
*
* This file uses rtrim() instead of untrailingslashit() and trailingslashit()
* to avoid formatting.php dependency.
* *
* @package WordPress * @package WordPress
* @subpackage i18n * @subpackage i18n
@ -113,7 +116,7 @@ class WP_Textdomain_Registry {
* @param string|false $path Language directory path or false if there is none available. * @param string|false $path Language directory path or false if there is none available.
*/ */
public function set( $domain, $locale, $path ) { public function set( $domain, $locale, $path ) {
$this->all[ $domain ][ $locale ] = $path ? trailingslashit( $path ) : false; $this->all[ $domain ][ $locale ] = $path ? rtrim( $path, '/' ) . '/' : false;
$this->current[ $domain ] = $this->all[ $domain ][ $locale ]; $this->current[ $domain ] = $this->all[ $domain ][ $locale ];
} }
@ -128,7 +131,7 @@ class WP_Textdomain_Registry {
* @param string $path Language directory path. * @param string $path Language directory path.
*/ */
public function set_custom_path( $domain, $path ) { public function set_custom_path( $domain, $path ) {
$this->custom_paths[ $domain ] = untrailingslashit( $path ); $this->custom_paths[ $domain ] = rtrim( $path, '/' );
} }
/** /**
@ -187,7 +190,7 @@ class WP_Textdomain_Registry {
} }
if ( $mo_path === $path ) { if ( $mo_path === $path ) {
$found_location = trailingslashit( $location ); $found_location = rtrim( $location, '/' ) . '/';
} }
} }
} }
@ -201,7 +204,7 @@ class WP_Textdomain_Registry {
// If no path is found for the given locale and a custom path has been set // If no path is found for the given locale and a custom path has been set
// using load_plugin_textdomain/load_theme_textdomain, use that one. // using load_plugin_textdomain/load_theme_textdomain, use that one.
if ( 'en_US' !== $locale && isset( $this->custom_paths[ $domain ] ) ) { if ( 'en_US' !== $locale && isset( $this->custom_paths[ $domain ] ) ) {
$fallback_location = trailingslashit( $this->custom_paths[ $domain ] ); $fallback_location = rtrim( $this->custom_paths[ $domain ], '/' ) . '/';
$this->set( $domain, $locale, $fallback_location ); $this->set( $domain, $locale, $fallback_location );
return $fallback_location; return $fallback_location;
} }

2
wp-includes/version.php
View File

@ -16,7 +16,7 @@
* *
* @global string $wp_version * @global string $wp_version
*/ */
$wp_version = '6.2-beta1-55301'; $wp_version = '6.2-beta1-55302';
/** /**
* 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.