Merge branch 'master' into php5

* master:
  BigInteger: "be less overly clever loading Crypt/Random"
This commit is contained in:
Andreas Fischer 2014-05-30 15:50:36 +02:00
commit 4a89349615

View File

@ -3052,8 +3052,7 @@ class Math_BigInteger
*/ */
function _random_number_helper($size) function _random_number_helper($size)
{ {
$crypt_random = function_exists('crypt_random_string') || (!class_exists('Crypt_Random') && function_exists('crypt_random_string')); if (function_exists('crypt_random_string')) {
if ($crypt_random) {
$random = crypt_random_string($size); $random = crypt_random_string($size);
} else { } else {
$random = ''; $random = '';