Changeset 55351 for trunk/src/wp-includes/l10n.php

Timestamp:

02/15/2023 11:35:33 PM (20 months ago)

Author:

SergeyBiryukov

Message:

I18N: Check that $wp_locale global is set before calling its methods.

This avoids a fatal error if these functions are called in a mu-plugin before $wp_locale is set:

• wp_get_list_item_separator()
• wp_get_word_count_type()

Follow-up to [52929], [52933], [55279], [55295].

Props kraftbj.
Fixes #56698.

File:

• trunk/src/wp-includes/l10n.php (modified) (2 diffs)

trunk/src/wp-includes/l10n.php

@@ -1808 +1808 @@
     global $wp_locale;
 
+    if ( ! ( $wp_locale instanceof WP_Locale ) ) {
+        // Default value of WP_Locale::get_list_item_separator().
+        /* translators: Used between list items, there is a space after the comma. */
+        return __( ', ' );
+    }
+
     return $wp_locale->get_list_item_separator();
 }
@@ -1824 +1830 @@
     global $wp_locale;
 
+    if ( ! ( $wp_locale instanceof WP_Locale ) ) {
+        // Default value of WP_Locale::get_word_count_type().
+        return 'words';
+    }
+
     return $wp_locale->get_word_count_type();
 }