diff options
Diffstat (limited to 'src/etc')
| -rw-r--r-- | src/etc/inc/config.lib.inc | 3 | ||||
| -rw-r--r-- | src/etc/inc/globals.inc | 1 |
2 files changed, 3 insertions, 1 deletions
diff --git a/src/etc/inc/config.lib.inc b/src/etc/inc/config.lib.inc index fc152a2..0ee64b9 100644 --- a/src/etc/inc/config.lib.inc +++ b/src/etc/inc/config.lib.inc @@ -909,7 +909,8 @@ function pfSense_clear_globals() { $error = error_get_last(); - if ($error !== NULL) { + // Errors generated by user code (diag_commands.php) are identified by path and not added to notices + if ($error !== NULL && !preg_match('|^' . preg_quote($g['tmp_path_user_code']) . '/[^/]{1,16}$|', $error['file'])) { if (in_array($error['type'], array(E_ERROR, E_COMPILE_ERROR, E_CORE_ERROR, E_RECOVERABLE_ERROR))) { $errorstr = "PHP ERROR: Type: {$error['type']}, File: {$error['file']}, Line: {$error['line']}, Message: {$error['message']}"; print($errorstr); diff --git a/src/etc/inc/globals.inc b/src/etc/inc/globals.inc index 9166421..c4533d8 100644 --- a/src/etc/inc/globals.inc +++ b/src/etc/inc/globals.inc @@ -50,6 +50,7 @@ $g = array( "varlog_path" => "/var/log", "etc_path" => "/etc", "tmp_path" => "/tmp", + "tmp_path_user_code" => "/tmp/user_code", "conf_path" => "/conf", "conf_default_path" => "/conf.default", "cf_path" => "/cf", |
