diff options
author | NewEraCracker <neweracracker@gmail.com> | 2016-04-30 18:33:46 +0100 |
---|---|---|
committer | Chris Buechler <cmb@pfsense.org> | 2016-05-05 01:20:26 -0500 |
commit | 3ce8097f2459ffa8e839b19a18fb318e4314d9be (patch) | |
tree | 4ebafc77eec88d4825abad51e3de1080b9864357 /src/usr/local | |
parent | 3d5fb131796ba6d9c5d53efe77080d7ddb334f22 (diff) | |
download | pfsense-3ce8097f2459ffa8e839b19a18fb318e4314d9be.zip pfsense-3ce8097f2459ffa8e839b19a18fb318e4314d9be.tar.gz |
Fix Redmine #6097
Replace '/usr/bin/grep -vi warning' with '/bin/cat'
Diffstat (limited to 'src/usr/local')
-rw-r--r-- | src/usr/local/www/crash_reporter.php | 2 | ||||
-rw-r--r-- | src/usr/local/www/index.php | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/src/usr/local/www/crash_reporter.php b/src/usr/local/www/crash_reporter.php index 3542d96..e8918b3 100644 --- a/src/usr/local/www/crash_reporter.php +++ b/src/usr/local/www/crash_reporter.php @@ -96,7 +96,7 @@ $crash_report_header .= php_uname("r") . "\n"; $crash_report_header .= php_uname("v") . "\n"; $crash_report_header .= "\nCrash report details:\n"; -exec("/usr/bin/grep -vi warning /tmp/PHP_errors.log", $php_errors); +exec("/bin/cat /tmp/PHP_errors.log", $php_errors); if ($_POST['Submit'] == "Yes") { echo gettext("Processing..."); diff --git a/src/usr/local/www/index.php b/src/usr/local/www/index.php index f53769d..1f2eac0 100644 --- a/src/usr/local/www/index.php +++ b/src/usr/local/www/index.php @@ -90,7 +90,7 @@ if ($g['disablecrashreporter'] != true) { // Check to see if we have a crash report $x = 0; if (file_exists("/tmp/PHP_errors.log")) { - $total = `/usr/bin/grep -vi warning /tmp/PHP_errors.log | /usr/bin/wc -l | /usr/bin/awk '{ print $1 }'`; + $total = `/bin/cat /tmp/PHP_errors.log | /usr/bin/wc -l | /usr/bin/awk '{ print $1 }'`; if ($total > 0) { $x++; } |