From 9fd568fab8b32572fa3ea9afab03aadb411ef896 Mon Sep 17 00:00:00 2001 From: Gary Pendergast Date: Tue, 18 Dec 2018 03:40:47 +0000 Subject: [PATCH] i18n: Prevent a PHP warning when a mu-plugin loads a textdomain. `determine_locale()` accesses the `$pagenow` global, but this is set after mu-plugins are loaded, so we need to check that it's been set. Props swissspidy, azaozz. See #45668. Built from https://develop.svn.wordpress.org/branches/5.0@44284 git-svn-id: http://core.svn.wordpress.org/branches/5.0@44114 1a063a9b-81f0-0310-95a4-ce76da25c4cd --- wp-includes/l10n.php | 2 +- wp-includes/version.php | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/wp-includes/l10n.php b/wp-includes/l10n.php index b073cb32d5..3df4898869 100644 --- a/wp-includes/l10n.php +++ b/wp-includes/l10n.php @@ -138,7 +138,7 @@ function determine_locale() { $determined_locale = get_user_locale(); } - if ( ! empty( $_GET['wp_lang'] ) && 'wp-login.php' === $GLOBALS['pagenow'] ) { + if ( ! empty( $_GET['wp_lang'] ) && ! empty( $GLOBALS['pagenow'] ) && 'wp-login.php' === $GLOBALS['pagenow'] ) { $determined_locale = sanitize_text_field( $_GET['wp_lang'] ); } diff --git a/wp-includes/version.php b/wp-includes/version.php index 42bd582130..9a858224f9 100644 --- a/wp-includes/version.php +++ b/wp-includes/version.php @@ -4,7 +4,7 @@ * * @global string $wp_version */ -$wp_version = '5.0.2-RC1-44259'; +$wp_version = '5.0.2-RC1-44284'; /** * Holds the WordPress DB revision, increments when changes are made to the WordPress DB schema.