diff options
author | plegall <plg@piwigo.org> | 2013-04-18 13:01:57 +0000 |
---|---|---|
committer | plegall <plg@piwigo.org> | 2013-04-18 13:01:57 +0000 |
commit | 08ca141ecc69be61ad1d29df43c1d7df6a52c79d (patch) | |
tree | 3b4fb5e096a1be09003db8a75d12f3e687d988d7 /include/passwordhash.class.php | |
parent | f05e793ad66506f9579b3fd0c9ee6df7ba63ab2f (diff) |
merge r22280 from branch 2.5 to trunk
bug 2864 fixed: avoid warning on /dev/urandom with open_basedir restriction
git-svn-id: http://piwigo.org/svn/trunk@22281 68402e56-0260-453c-a942-63ccdbb3a9ee
Diffstat (limited to 'include/passwordhash.class.php')
-rw-r--r-- | include/passwordhash.class.php | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/include/passwordhash.class.php b/include/passwordhash.class.php index 12958c7f1..84447b277 100644 --- a/include/passwordhash.class.php +++ b/include/passwordhash.class.php @@ -48,7 +48,7 @@ class PasswordHash { function get_random_bytes($count) { $output = ''; - if (is_readable('/dev/urandom') && + if (@is_readable('/dev/urandom') && ($fh = @fopen('/dev/urandom', 'rb'))) { $output = fread($fh, $count); fclose($fh); |