Update random_compat to master.
Clarifies strings, Merges [35587] upstream. See #34409, #28633 Built from https://develop.svn.wordpress.org/trunk@35600 git-svn-id: http://core.svn.wordpress.org/trunk@35564 1a063a9b-81f0-0310-95a4-ce76da25c4cd
This commit is contained in:
parent
c5a8c3aa86
commit
49e6e41fb4
|
@ -110,8 +110,8 @@ if (PHP_VERSION_ID < 70000) {
|
|||
DIRECTORY_SEPARATOR === '/' &&
|
||||
PHP_VERSION_ID >= 50300
|
||||
) ||
|
||||
// Windows with PHP >= 5.3.4
|
||||
PHP_VERSION_ID >= 50401 // Modification from upstream, see #34409
|
||||
// Windows with PHP >= 5.4.1
|
||||
PHP_VERSION_ID >= 50401
|
||||
)
|
||||
) {
|
||||
// See random_bytes_openssl.php
|
||||
|
|
|
@ -72,6 +72,6 @@ function random_bytes($bytes)
|
|||
* If we reach here, PHP has failed us.
|
||||
*/
|
||||
throw new Exception(
|
||||
'PHP failed to generate random data.'
|
||||
'Could not gather sufficient random data'
|
||||
);
|
||||
}
|
||||
|
|
|
@ -132,6 +132,6 @@ function random_bytes($bytes)
|
|||
* If we reach here, PHP has failed us.
|
||||
*/
|
||||
throw new Exception(
|
||||
'PHP failed to generate random data.'
|
||||
'Error reading from source device'
|
||||
);
|
||||
}
|
||||
|
|
|
@ -79,6 +79,6 @@ function random_bytes($bytes)
|
|||
* If we reach here, PHP has failed us.
|
||||
*/
|
||||
throw new Exception(
|
||||
'PHP failed to generate random data.'
|
||||
'Could not gather sufficient random data'
|
||||
);
|
||||
}
|
||||
|
|
|
@ -67,6 +67,6 @@ function random_bytes($bytes)
|
|||
* If we reach here, PHP has failed us.
|
||||
*/
|
||||
throw new Exception(
|
||||
'PHP failed to generate random data.'
|
||||
'Could not gather sufficient random data'
|
||||
);
|
||||
}
|
||||
|
|
|
@ -71,6 +71,6 @@ function random_bytes($bytes)
|
|||
* If we reach here, PHP has failed us.
|
||||
*/
|
||||
throw new Exception(
|
||||
'PHP failed to generate random data.'
|
||||
'Could not gather sufficient random data'
|
||||
);
|
||||
}
|
||||
|
|
|
@ -4,7 +4,7 @@
|
|||
*
|
||||
* @global string $wp_version
|
||||
*/
|
||||
$wp_version = '4.4-beta3-35599';
|
||||
$wp_version = '4.4-beta3-35600';
|
||||
|
||||
/**
|
||||
* Holds the WordPress DB revision, increments when changes are made to the WordPress DB schema.
|
||||
|
|
Loading…
Reference in New Issue