From 73779aaa0af6e9dbd8de4ee25fef510dc243c945 Mon Sep 17 00:00:00 2001
From: Sergey Biryukov <sergeybiryukov@git.wordpress.org>
Date: Sun, 27 Sep 2020 05:15:03 +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.
git-svn-id: https://develop.svn.wordpress.org/trunk@49057 602fd350-edb4-49c9-b593-d223f7449a82
---
src/wp-includes/sodium_compat/src/Core/Util.php | 1 +
1 file changed, 1 insertion(+)
diff --git a/src/wp-includes/sodium_compat/src/Core/Util.php b/src/wp-includes/sodium_compat/src/Core/Util.php
index a5808b191d..aa93dfd044 100644
--- a/src/wp-includes/sodium_compat/src/Core/Util.php
+++ b/src/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);
}