summaryrefslogtreecommitdiffstats
path: root/src/usr/local
diff options
context:
space:
mode:
authorNewEraCracker <neweracracker@gmail.com>2016-04-30 18:33:46 +0100
committerNewEraCracker <neweracracker@gmail.com>2016-04-30 18:33:46 +0100
commit918f0a9469aa05a9300a25c2ca60e2be83411226 (patch)
tree7d69d1d32208e96d9c9f78545fd019a5761a8a06 /src/usr/local
parent09c7fae46d2757815c1e4e5ead7c9896783e7013 (diff)
downloadpfsense-918f0a9469aa05a9300a25c2ca60e2be83411226.zip
pfsense-918f0a9469aa05a9300a25c2ca60e2be83411226.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.php2
-rw-r--r--src/usr/local/www/index.php2
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++;
}
OpenPOWER on IntegriCloud