Changeset 38976

Timestamp:

10/27/2016 03:42:09 AM (7 years ago)

Author:

pento

Message:

I18N: Fix a PHP fatal when get_locale() is called before $wpdb is ready.

If WPDB needs to bail early, it loads the translations, which need to load the locale. Without WPDB, we can't get any database options, so can only rely on what's been loaded so far.

Fixes #29783.

Location:

trunk

Files:

• src/wp-includes/l10n.php (modified) (2 diffs)
• tests/phpunit/tests/l10n/getLocale.php (modified) (1 diff)

trunk/src/wp-includes/l10n.php

@@ -29 +29 @@
  */
 function get_locale() {
-    global $locale, $wp_local_package;
+    global $locale, $wp_local_package, $wpdb;
 
     if ( isset( $locale ) ) {
@@ -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 ) {
+            return 'en_US';
+        }
+
+        return $locale;
     }
 

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' ) );