Merge branch 'master' into php5

* master:
  Random: wrap crypt_random_string in a function_exists call
This commit is contained in:
Andreas Fischer 2014-05-27 12:24:52 +02:00
commit 958430b5a8

View File

@ -40,6 +40,10 @@
* @link http://phpseclib.sourceforge.net
*/
// laravel is a PHP framework that utilizes phpseclib. laravel workbenches may, independently,
// have phpseclib as a requirement as well. if you're developing such a program you may encounter
// a "Cannot redeclare crypt_random_string()" error.
if (!function_exists('crypt_random_string')) {
/**
* "Is Windows" test
*
@ -244,3 +248,4 @@ function crypt_random_string($length)
}
return substr($result, 0, $length);
}
}