Merge pull request #87 from terite/master

Fix SSH2 when autoloaded from Composer
This commit is contained in:
terrafrost 2013-04-05 12:21:46 -07:00
commit 39e5b1d029
2 changed files with 5 additions and 6 deletions

View File

@ -43,6 +43,9 @@
"File": "phpseclib/",
"Math": "phpseclib/",
"Net": "phpseclib/"
}
},
"files": [
"phpseclib/Crypt/Random.php"
]
}
}

View File

@ -80,11 +80,7 @@ if (!class_exists('Math_BigInteger')) {
/**
* Include Crypt_Random
*/
// the class_exists() will only be called if the crypt_random_string function hasn't been defined and
// will trigger a call to __autoload() if you're wanting to auto-load classes
// call function_exists() a second time to stop the require_once from being called outside
// of the auto loader
if (!function_exists('crypt_random_string') && !class_exists('Crypt_Random') && !function_exists('crypt_random_string')) {
if (!function_exists('crypt_random_string')) {
require_once('Crypt/Random.php');
}