Changeset 51032

Timestamp:

05/26/2021 04:04:50 PM (5 years ago)

Author:

SergeyBiryukov

Message:

General: Avoid a PHP warning when checking the mbstring.func_overload PHP value.

This avoids "A non-numeric value encountered" warning when mbstring.func_overload is set to something other than a numeric string, e.g. an empty string instead of the default '0' value.

Props djbu.
Fixes #53282.

Location:

trunk/src/wp-includes

Files:

• functions.php (modified) (1 diff)
• pomo/streams.php (modified) (1 diff)

trunk/src/wp-includes/functions.php

@@ -6863 +6863 @@
 
         if ( is_null( $overloaded ) ) {
-                $overloaded = function_exists( 'mb_internal_encoding' ) && ( ini_get( 'mbstring.func_overload' ) & 2 ); // phpcs:ignore PHPCompatibility.IniDirectives.RemovedIniDirectives.mbstring_func_overloadDeprecated
+                if ( function_exists( 'mb_internal_encoding' )
+                        && ( (int) ini_get( 'mbstring.func_overload' ) & 2 ) // phpcs:ignore PHPCompatibility.IniDirectives.RemovedIniDirectives.mbstring_func_overloadDeprecated
+                ) {
+                        $overloaded = true;
+                } else {
+                        $overloaded = false;
+                }
         }
 

trunk/src/wp-includes/pomo/streams.php

@@ -19 +19 @@
                  */
                 function __construct() {
-                        $this->is_overloaded = ( ( ini_get( 'mbstring.func_overload' ) & 2 ) != 0 ) && function_exists( 'mb_substr' ); // phpcs:ignore PHPCompatibility.IniDirectives.RemovedIniDirectives.mbstring_func_overloadDeprecated
-                        $this->_pos          = 0;
+                        if ( function_exists( 'mb_substr' )
+                                && ( (int) ini_get( 'mbstring.func_overload' ) & 2 ) // phpcs:ignore PHPCompatibility.IniDirectives.RemovedIniDirectives.mbstring_func_overloadDeprecated
+                        ) {
+                                $this->is_overloaded = true;
+                        } else {
+                                $this->is_overloaded = false;
+                        }
+
+                        $this->_pos = 0;
                 }