Merge pull request #1077 from whitevast/patch-7

sergejey · web-flow · commit 776d83781898 · 2023-06-22T09:52:48.000+03:00
Update errors.class.php
diff --git a/lib/errors.class.php b/lib/errors.class.php
@@ -107,7 +107,7 @@ function majordomoExceptionHandler($e)
     } else {
         $url = 'commandline';
     }
-    majordomoSaveError($url . "\nPHP exception: " . $e->getMessage() . "\nBacktrace: " . $e->getTraceAsString(), 'exceptions');
+    majordomoSaveError($url . "\nPHP exception: " . $e->getMessage() . " in " . $e->getFile() . " on line " . $e->getLine() . "\nBacktrace: " . $e->getTraceAsString(), 'exceptions');
     return true;
 }
 
@@ -146,4 +146,4 @@ function phpShutDownFunction()
 
 register_shutdown_function('phpShutDownFunction');
 set_error_handler("majordomoErrorHandler");
-set_exception_handler('majordomoExceptionHandler');
+set_exception_handler('majordomoExceptionHandler');

Original file line number	Diff line number	Diff line change
`@@ -107,7 +107,7 @@ function majordomoExceptionHandler($e)`
`107`	`107`	`} else {`
`108`	`108`	`$url = 'commandline';`
`109`	`109`	`}`
`110`		`- majordomoSaveError($url . "\nPHP exception: " . $e->getMessage() . "\nBacktrace: " . $e->getTraceAsString(), 'exceptions');`
	`110`	`+ majordomoSaveError($url . "\nPHP exception: " . $e->getMessage() . " in " . $e->getFile() . " on line " . $e->getLine() . "\nBacktrace: " . $e->getTraceAsString(), 'exceptions');`
`111`	`111`	`return true;`
`112`	`112`	`}`
`113`	`113`
`@@ -146,4 +146,4 @@ function phpShutDownFunction()`
`146`	`146`
`147`	`147`	`register_shutdown_function('phpShutDownFunction');`
`148`	`148`	`set_error_handler("majordomoErrorHandler");`
`149`		`-set_exception_handler('majordomoExceptionHandler');`
	`149`	`+set_exception_handler('majordomoExceptionHandler');`