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

Timestamp:

10/29/2016 11:22:50 AM (9 years ago)

Author:

ocean90

Message:

I18N: Don't initialize WP_Locale_Switcher in wp_load_translations_early().

wp_load_translations_early() is used when WordPress isn't fully initialized. Therefore using the WP_Locale_Switcher with get_locale()/get_user_locale() can cause PHP fatal errors.
This reverts [38976] and [38977], and instead removes WP_Locale_Switcher from wp_load_translations_early().

See #29783.
Fixes #38535.

File:

• trunk/src/wp-includes/l10n.php (modified) (1 diff)

trunk/src/wp-includes/l10n.php

@@ -49 +49 @@
     if ( defined( 'WPLANG' ) ) {
         $locale = WPLANG;
-    }
-
-    // If $wpdb hasn't been initialised yet, we can only return what we have.
-    if ( ! $wpdb ) {
-        if ( ! $locale ) {
-            $locale = 'en_US';
-        }
-
-        /** This filter is documented in wp-includes/l10n.php */
-        return apply_filters( 'locale', $locale );
     }