summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorCiaranG <ciaran@ciarang.com>2009-04-21 23:36:15 +0100
committerCiaranG <ciaran@ciarang.com>2009-04-21 23:36:15 +0100
commitec5e06a542d6b06ea9b1d3de7cb309dd1088b4d4 (patch)
tree4773a97ddb0bb8141da0f0e8959bca4f1570eef5
parent4cb0a929806869b09d4325c1464fc2ecb7b5a76e (diff)
Suppress errors when checking for the existence of files that might be restricted by open_basedir - should resolve issue #1310
-rw-r--r--lib/common.php2
-rw-r--r--lib/util.php2
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 e0eda0114..e1dd238ba 100644
--- a/lib/util.php
+++ b/lib/util.php
@@ -966,7 +966,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);