Changeset 55302

Timestamp:

02/09/2023 04:33:36 PM (20 months ago)

Author:

swissspidy

Message:

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.

File:

• trunk/src/wp-includes/class-wp-textdomain-registry.php (modified) (5 diffs)

trunk/src/wp-includes/class-wp-textdomain-registry.php

@@ -1 +1 @@
 <?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
@@ -114 +117 @@
      */
     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 ];
     }
@@ -129 +132 @@
      */
     public function set_custom_path( $domain, $path ) {
-        $this->custom_paths[ $domain ] = untrailingslashit( $path );
+        $this->custom_paths[ $domain ] = rtrim( $path, '/' );
     }
 
@@ -188 +191 @@
 
                 if ( $mo_path === $path ) {
-                    $found_location = trailingslashit( $location );
+                    $found_location = rtrim( $location, '/' ) . '/';
                 }
             }
@@ -202 +205 @@
         // using load_plugin_textdomain/load_theme_textdomain, use that one.
         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 );
             return $fallback_location;