From 1967d2b7e74a378380f84abaf8e0c0c77f4f986b Mon Sep 17 00:00:00 2001 From: rho Date: Wed, 7 Nov 2007 21:08:29 +0000 Subject: [PATCH] minor tweak on #136 patch, use @init_get and init_get_bool git-svn-id: svn://svn.elgg.net/elgg/devel@1274 9cd68787-cb06-0410-8a26-e846cff1755a --- lib/elgglib.php | 4 ++-- mod/explodeping/lib.php | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/lib/elgglib.php b/lib/elgglib.php index cd15fb9..43a08b7 100644 --- a/lib/elgglib.php +++ b/lib/elgglib.php @@ -1265,10 +1265,10 @@ function get_performance_info() { // Grab the load average for the last minute // /proc will only work under some linux configurations // while uptime is there under MacOSX/Darwin and other unices - if (!ini_get('open_basedir') && is_readable('/proc/loadavg') && $loadavg = @file('/proc/loadavg')) { + if (!@ini_get('open_basedir') && is_readable('/proc/loadavg') && $loadavg = @file('/proc/loadavg')) { list($server_load) = explode(' ', $loadavg[0]); unset($loadavg); - } else if (!ini_get('open_basedir') && function_exists('is_executable') && is_executable('/usr/bin/uptime') && $loadavg = `/usr/bin/uptime` ) { + } else if (!@ini_get('open_basedir') && function_exists('is_executable') && is_executable('/usr/bin/uptime') && $loadavg = `/usr/bin/uptime` ) { if (preg_match('/load averages?: (\d+[\.:]\d+)/', $loadavg, $matches)) { $server_load = $matches[1]; } else { diff --git a/mod/explodeping/lib.php b/mod/explodeping/lib.php index ff5d242..da34709 100644 --- a/mod/explodeping/lib.php +++ b/mod/explodeping/lib.php @@ -23,7 +23,7 @@ // FIXME: workaround to annoying warning when is enabled open_basedir // restriction - if (ini_get('open_basedir') || !ini_get('allow_url_fopen')) { return;} + if (@ini_get('open_basedir') || !ini_get_bool('allow_url_fopen')) { return;} if (!$explodeservice = get_record('datalists', 'name', 'explodeservice')) { -- 2.11.4.GIT