Changeset 39005

Timestamp:

10/29/2016 11:22:50 AM (8 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.

Location:

trunk

Files:

• src/wp-includes/l10n.php (modified) (1 diff)
• src/wp-includes/load.php (modified) (1 diff)
• tests/phpunit/tests/l10n/getLocale.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 );
     }
 

trunk/src/wp-includes/load.php

@@ -918 +918 @@
 
     $wp_locale = new WP_Locale();
-    $wp_locale_switcher = new WP_Locale_Switcher();
-    $wp_locale_switcher->init();
 }
 

trunk/tests/phpunit/tests/l10n/getLocale.php

@@ -82 +82 @@
     }
 
-    public function test_should_fall_back_on_locale_when_wpdb_is_unavailable() {
-        global $locale, $wpdb;
-
-        $old_locale = $locale;
-        $old_wpdb = $wpdb;
-
-        $locale = $expected = "Is this a locale? No. No it isn't.";
-        $wpdb = null;
-
-        $found = get_locale();
-
-        $locale = $old_locale;
-        $wpdb = $old_wpdb;
-
-        $this->assertSame( $expected, $found );
-    }
-
-    public function test_should_fall_back_on_es_US_when_locale_and_wpdb_are_unavailable() {
-        global $locale, $wpdb;
-
-        $old_locale = $locale;
-        $old_wpdb = $wpdb;
-
-        $locale = null;
-        $wpdb = null;
-
-        $found = get_locale();
-
-        $locale = $old_locale;
-        $wpdb = $old_wpdb;
-
-        $this->assertSame( 'en_US', $found );
-    }
-
     public function test_should_respect_get_locale_filter() {
         add_filter( 'locale', array( $this, 'filter_get_locale' ) );