WordPress-C
/
WordPress
mirror of https://github.com/WordPress/WordPress.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

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
This commit is contained in:
Sergey Biryukov 2020-09-27 05:17:05 +00:00
parent 67752b98e0
commit bf2edf9cab
2 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
wp-includes/sodium_compat/src/Core/Util.php
View File

@ -911,6 +911,7 @@ abstract class ParagonIE_Sodium_Core_Util
if ($mbstring === null) { if ($mbstring === null) {
$mbstring = extension_loaded('mbstring') $mbstring = extension_loaded('mbstring')
&& defined('MB_OVERLOAD_STRING')
&& &&
((int) (ini_get('mbstring.func_overload')) & MB_OVERLOAD_STRING); ((int) (ini_get('mbstring.func_overload')) & MB_OVERLOAD_STRING);
} }

2
wp-includes/version.php
View File

@ -13,7 +13,7 @@
* *
* @global string $wp_version * @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. * Holds the WordPress DB revision, increments when changes are made to the WordPress DB schema.