Changeset 55351

Timestamp:

02/15/2023 11:35:33 PM (18 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.

Location:

trunk

Files:

• src/wp-includes/class-wp-locale.php (modified) (1 diff)
• src/wp-includes/l10n.php (modified) (2 diffs)
• tests/phpunit/tests/l10n/wpGetListItemSeparator.php (added)
• tests/phpunit/tests/l10n/wpGetWordCountType.php (added)

trunk/src/wp-includes/class-wp-locale.php

@@ -236 +236 @@
         $this->number_format['decimal_point'] = ( 'number_format_decimal_point' === $decimal_point ) ? '.' : $decimal_point;
 
-        /* translators: used between list items, there is a space after the comma */
+        /* translators:  */
         $this->list_item_separator = __( ', ' );
 

trunk/src/wp-includes/l10n.php

@@ -1808 +1808 @@
     global $wp_locale;
 
+
+
+
+
+
+
     return $wp_locale->get_list_item_separator();
 }
@@ -1824 +1830 @@
     global $wp_locale;
 
+
+
+
+
+
     return $wp_locale->get_word_count_type();
 }