Changeset 58683

Timestamp:

07/06/2024 03:05:37 PM (8 months ago)

Author:

SergeyBiryukov

Message:

Code Modernization: Simplify a conditional in wp_is_ini_value_changeable().

This commit reverts the code to the code from before the bug fix related to PHP 5.2.6–5.2.17.

As support for PHP 5.2 has been dropped, the workaround for the PHP 5.2 bug is no longer needed.

Follow-up to [38015], [38017], [44950], [45058], [57985], [58678], [58682].

Props jrf, ayeshrajans.
See #61574.

Location:

trunk

Files:

• src/wp-includes/load.php (modified) (1 diff)
• tests/phpunit/tests/load/wpIsIniValueChangeable.php (modified) (1 diff)

trunk/src/wp-includes/load.php

@@ -1680 +1680 @@
     }
 
-    // Bit operator to workaround https://bugs.php.net/bug.php?id=44936 which changes access level to 63 in PHP 5.2.6 - 5.2.17.
     if ( isset( $ini_all[ $setting ]['access'] )
-        && ( INI_ALL === ( $ini_all[ $setting ]['access'] & 7 ) || INI_USER === ( $ini_all[ $setting ]['access'] & 7 ) )
+        && ( INI_ALL === $ini_all[ $setting ]['access'] || INI_USER === $ini_all[ $setting ]['access'] )
     ) {
         return true;

trunk/tests/phpunit/tests/load/wpIsIniValueChangeable.php

@@ -42 +42 @@
         );
 
-        if ( PHP_VERSION_ID > 70000 && extension_loaded( 'Tidy' ) ) {
+        if ( extension_loaded( 'Tidy' ) ) {
             $array[] = array( 'tidy.clean_output', true ); // PHP_INI_USER.
         }