From 0d76199dbb583112d2ba9380f43b1d36b5aa248b Mon Sep 17 00:00:00 2001 From: Alan Date: Wed, 6 Sep 2023 12:23:29 +0800 Subject: [PATCH] trigger_error only for errors --- Pman.php | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/Pman.php b/Pman.php index 214a532..b068439 100644 --- a/Pman.php +++ b/Pman.php @@ -516,6 +516,9 @@ class Pman extends HTML_FlexyFramework_Page if(!empty($errors)){ DB_DataObject::factory('Events')->writeEventLogExtra($errors); } + if (!preg_match('/^(ERROR|NOTICE)/', $type )) { + $type = 'ERROR-' . $type; + } $this->addEvent($type, false, $str); @@ -1181,12 +1184,14 @@ class Pman extends HTML_FlexyFramework_Page $e->onInsert(isset($_REQUEST) ? $_REQUEST : array() , $this); - + if (substr($act, 0, 5) !== 'ERROR') { + return $e; + } $str = $obj !== false ? "{$obj->tableName()}:{$obj->id} " : ''; $de = ini_set('display_errors', 0); trigger_error("{$act} [event_id={$e->id}] {$str} {$remarks}" , E_USER_NOTICE); ini_set('display_errors', $de ); - + return $e; } -- 2.39.2