From bf2edf9cab574388dbeacc9891490e7dcdd9b46f Mon Sep 17 00:00:00 2001
From: Sergey Biryukov <sergeybiryukov.ru@gmail.com>
Date: Sun, 27 Sep 2020 05:17:05 +0000
Subject: [PATCH] External Libraries: Backport a commit from sodium_compat
 trunk to fix a PHP 8 error.

This addresses an "Undefined constant `MB_OVERLOAD_STRING`" fatal error in the `ParagonIE_Sodium_Core_Util::isMbStringOverride()` method.

In PHP 8, the `MB_OVERLOAD_STRING` constant has been removed, along with the `mbstring` function overloading feature.

Fixes #51399.
Built from https://develop.svn.wordpress.org/trunk@49057


git-svn-id: http://core.svn.wordpress.org/trunk@48819 1a063a9b-81f0-0310-95a4-ce76da25c4cd
---
 wp-includes/sodium_compat/src/Core/Util.php | 1 +
 wp-includes/version.php                     | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/wp-includes/sodium_compat/src/Core/Util.php b/wp-includes/sodium_compat/src/Core/Util.php
index a5808b191d..aa93dfd044 100644
--- a/wp-includes/sodium_compat/src/Core/Util.php
+++ b/wp-includes/sodium_compat/src/Core/Util.php
@@ -911,6 +911,7 @@ abstract class ParagonIE_Sodium_Core_Util
 
         if ($mbstring === null) {
             $mbstring = extension_loaded('mbstring')
+                && defined('MB_OVERLOAD_STRING')
                 &&
             ((int) (ini_get('mbstring.func_overload')) & MB_OVERLOAD_STRING);
         }
diff --git a/wp-includes/version.php b/wp-includes/version.php
index 089215be4e..c2d58459c7 100644
--- a/wp-includes/version.php
+++ b/wp-includes/version.php
@@ -13,7 +13,7 @@
  *
  * @global string $wp_version
  */
-$wp_version = '5.6-alpha-49056';
+$wp_version = '5.6-alpha-49057';
 
 /**
  * Holds the WordPress DB revision, increments when changes are made to the WordPress DB schema.