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

Timestamp:

10/27/2016 03:42:09 AM (9 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.

File:

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

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;
     }