Changeset 34924

Timestamp:

10/08/2015 12:16:07 AM (11 years ago)

Author:

dd32

Message:

Revert [34922] pending PHP 5.2 compatibility.
See #28633

Location:

trunk/src/wp-includes

Files:

• compat.php (modified) (1 diff)
• pluggable.php (modified) (3 diffs)
• random_compat (deleted)

trunk/src/wp-includes/compat.php

@@ -333 +333 @@
         }
 }
-
-// random_int was introduced in PHP 7.0
-if ( ! function_exists( 'random_int' ) ) {
-        require ABSPATH . WPINC . '/random_compat/random.php';
-}

trunk/src/wp-includes/pluggable.php

@@ -2133 +2133 @@
  *
  * @since 2.6.2
- * @since 4.4 Uses PHP7 random_int() or the random_compat library if avaialble.
  *
  * @global string $rnd_value
  * @staticvar string $seed
- * @staticvar bool $external_rand_source_available
  *
  * @param int $min Lower limit for the generated number
@@ -2145 +2143 @@
 function wp_rand( $min = 0, $max = 0 ) {
         global $rnd_value;
-
-        // Some misconfigured 32bit environments (Entropy PHP, for example) truncate integers larger than PHP_INT_MAX to PHP_INT_MAX rather than overflowing them to floats.
-        $max_random_number = 3000000000 === 2147483647 ? (float) "4294967295" : 4294967295; // 4294967295 = 0xffffffff
-
-        // We only handle Ints, floats are truncated to their integer value.
-        $min = (int) $min;
-        $max = (int) $max;
-
-        // Use PHP's CSPRNG, or a compatible method
-        static $use_random_int_functionality = true;
-        if ( $use_random_int_functionality ) {
-                try {
-                        $_max = ( 0 != $max ) ? $max : $max_random_number;
-                        // wp_rand() can accept arguements in either order, PHP cannot.
-                        $_max = max( $min, $_max );
-                        $_min = min( $min, $_max );
-                        $val = random_int( $_min, $_max );
-                        if ( false !== $val ) {
-                                return absint( $val );
-                        } else {
-                                $use_random_int_functionality = false;
-                        }
-                } catch ( Throwable $t ) { 
-                        $use_random_int_functionality = false;
-                } catch ( Exception $e ) {
-                        $use_random_int_functionality = false;
-                }
-        }
 
         // Reset $rnd_value after 14 uses
@@ -2197 +2167 @@
 
         $value = abs(hexdec($value));
+
+        // Some misconfigured 32bit environments (Entropy PHP, for example) truncate integers larger than PHP_INT_MAX to PHP_INT_MAX rather than overflowing them to floats.
+        $max_random_number = 3000000000 === 2147483647 ? (float) "4294967295" : 4294967295; // 4294967295 = 0xffffffff
 
         // Reduce the value to be within the min - max range