diff options
| author | Evan Prodromou <evan@controlyourself.ca> | 2009-04-23 05:24:13 -0400 |
|---|---|---|
| committer | Evan Prodromou <evan@controlyourself.ca> | 2009-04-23 05:24:13 -0400 |
| commit | 85c7b8df7101185907a43a8d83d54805a8473c2e (patch) | |
| tree | 864dc346d82c029a2c5112ff7643b4b9bc17cb02 /lib | |
| parent | 2053bdabef929f4a095d91fbdd3fa62646e9f332 (diff) | |
| parent | 63c52784c7acc54b0b7b39ff3ca7763774e4ab9a (diff) | |
Merge branch '0.7.x' of git@gitorious.org:laconica/dev into 0.7.x
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/common.php | 2 | ||||
| -rw-r--r-- | lib/util.php | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/lib/common.php b/lib/common.php index b3882d207..f983c4d16 100644 --- a/lib/common.php +++ b/lib/common.php @@ -192,7 +192,7 @@ $_config_files[] = INSTALLDIR.'/config.php'; $_have_a_config = false; foreach ($_config_files as $_config_file) { - if (file_exists($_config_file)) { + if (@file_exists($_config_file)) { include_once($_config_file); $_have_a_config = true; } diff --git a/lib/util.php b/lib/util.php index 9b6d2941a..af4db4f02 100644 --- a/lib/util.php +++ b/lib/util.php @@ -980,7 +980,7 @@ function common_root_url($ssl=false) function common_good_rand($bytes) { // XXX: use random.org...? - if (file_exists('/dev/urandom')) { + if (@file_exists('/dev/urandom')) { return common_urandom($bytes); } else { // FIXME: this is probably not good enough return common_mtrand($bytes); |