From 289233ee46097139bdc48b9c752ec5920aa1cfd3 Mon Sep 17 00:00:00 2001
From: desrosj <desrosj@git.wordpress.org>
Date: Wed, 20 Mar 2019 18:58:50 +0000
Subject: [PATCH] I18N: Remove admin notice when the `WPLANG` constant is no
 longer necessary.

Introduced in [29630], this admin notice informs administrators (or network administrators on multisite installs) that the `WPLANG` constant is no longer needed when the locale returned by `get_locale()` does not match. After 5 years, the notice is being removed to avoid causing confusion for non-technical users.

The `_deprecated_argument()` call will persist to inform developers of the issue within log files.

Props flixos90, iworks, ocean90.
Fixes #39675.
Built from https://develop.svn.wordpress.org/trunk@44946


git-svn-id: http://core.svn.wordpress.org/trunk@44777 1a063a9b-81f0-0310-95a4-ce76da25c4cd
---
 wp-admin/options-general.php | 8 --------
 wp-includes/version.php      | 2 +-
 2 files changed, 1 insertion(+), 9 deletions(-)

diff --git a/wp-admin/options-general.php b/wp-admin/options-general.php
index f06c52fa46..9f248365f6 100644
--- a/wp-admin/options-general.php
+++ b/wp-admin/options-general.php
@@ -183,14 +183,6 @@ if ( ! empty( $languages ) || ! empty( $translations ) ) {
 
 			// Add note about deprecated WPLANG constant.
 			if ( defined( 'WPLANG' ) && ( '' !== WPLANG ) && $locale !== WPLANG ) {
-				if ( is_multisite() && current_user_can( 'manage_network_options' )
-					|| ! is_multisite() && current_user_can( 'manage_options' ) ) {
-					?>
-					<p class="description">
-						<strong><?php _e( 'Note:' ); ?></strong> <?php printf( __( 'The %1$s constant in your %2$s file is no longer needed.' ), '<code>WPLANG</code>', '<code>wp-config.php</code>' ); ?>
-					</p>
-					<?php
-				}
 				_deprecated_argument( 'define()', '4.0.0', sprintf( __( 'The %1$s constant in your %2$s file is no longer needed.' ), 'WPLANG', 'wp-config.php' ) );
 			}
 			?>
diff --git a/wp-includes/version.php b/wp-includes/version.php
index 6ae4e08e92..b4b19950f8 100644
--- a/wp-includes/version.php
+++ b/wp-includes/version.php
@@ -13,7 +13,7 @@
  *
  * @global string $wp_version
  */
-$wp_version = '5.2-alpha-44945';
+$wp_version = '5.2-alpha-44946';
 
 /**
  * Holds the WordPress DB revision, increments when changes are made to the WordPress DB schema.