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:
Dion Hulse 2015-11-10 12:00:30 +00:00
parent c5a8c3aa86
commit 49e6e41fb4
7 changed files with 8 additions and 8 deletions

View File

@ -110,8 +110,8 @@ if (PHP_VERSION_ID < 70000) {
DIRECTORY_SEPARATOR === '/' && DIRECTORY_SEPARATOR === '/' &&
PHP_VERSION_ID >= 50300 PHP_VERSION_ID >= 50300
) || ) ||
// Windows with PHP >= 5.3.4 // Windows with PHP >= 5.4.1
PHP_VERSION_ID >= 50401 // Modification from upstream, see #34409 PHP_VERSION_ID >= 50401
) )
) { ) {
// See random_bytes_openssl.php // See random_bytes_openssl.php

View File

@ -72,6 +72,6 @@ function random_bytes($bytes)
* If we reach here, PHP has failed us. * If we reach here, PHP has failed us.
*/ */
throw new Exception( throw new Exception(
'PHP failed to generate random data.' 'Could not gather sufficient random data'
); );
} }

View File

@ -132,6 +132,6 @@ function random_bytes($bytes)
* If we reach here, PHP has failed us. * If we reach here, PHP has failed us.
*/ */
throw new Exception( throw new Exception(
'PHP failed to generate random data.' 'Error reading from source device'
); );
} }

View File

@ -79,6 +79,6 @@ function random_bytes($bytes)
* If we reach here, PHP has failed us. * If we reach here, PHP has failed us.
*/ */
throw new Exception( throw new Exception(
'PHP failed to generate random data.' 'Could not gather sufficient random data'
); );
} }

View File

@ -67,6 +67,6 @@ function random_bytes($bytes)
* If we reach here, PHP has failed us. * If we reach here, PHP has failed us.
*/ */
throw new Exception( throw new Exception(
'PHP failed to generate random data.' 'Could not gather sufficient random data'
); );
} }

View File

@ -71,6 +71,6 @@ function random_bytes($bytes)
* If we reach here, PHP has failed us. * If we reach here, PHP has failed us.
*/ */
throw new Exception( throw new Exception(
'PHP failed to generate random data.' 'Could not gather sufficient random data'
); );
} }

View File

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