diff options
| author | ArthurHoaro <arthur@hoa.ro> | 2020-10-20 21:37:20 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-10-20 21:37:20 +0200 |
| commit | 344544334961370388a2ea2eb72bb9827703d725 (patch) | |
| tree | dae15a87762c4a95c2b1622fad6391e55373486f /application/Utils.php | |
| parent | d8030c8155ee4c20573848b2444f6df0b65d1662 (diff) | |
| parent | 5c06c0870f8e425c2d4ed0f7c330c13e1605628e (diff) | |
| download | Shaarli-344544334961370388a2ea2eb72bb9827703d725.tar.gz Shaarli-344544334961370388a2ea2eb72bb9827703d725.tar.zst Shaarli-344544334961370388a2ea2eb72bb9827703d725.zip | |
Merge pull request #1602 from ArthurHoaro/fix/root-exceptions
Dislay an error if an exception occurs in the error handler
Diffstat (limited to 'application/Utils.php')
| -rw-r--r-- | application/Utils.php | 9 |
1 files changed, 9 insertions, 0 deletions
diff --git a/application/Utils.php b/application/Utils.php index bcfda65c..37be9a13 100644 --- a/application/Utils.php +++ b/application/Utils.php | |||
| @@ -463,3 +463,12 @@ function t($text, $nText = '', $nb = 1, $domain = 'shaarli') | |||
| 463 | { | 463 | { |
| 464 | return dn__($domain, $text, $nText, $nb); | 464 | return dn__($domain, $text, $nText, $nb); |
| 465 | } | 465 | } |
| 466 | |||
| 467 | /** | ||
| 468 | * Converts an exception into a printable stack trace string. | ||
| 469 | */ | ||
| 470 | function exception2text(Throwable $e): string | ||
| 471 | { | ||
| 472 | return $e->getMessage() . PHP_EOL . $e->getFile() . $e->getLine() . PHP_EOL . $e->getTraceAsString(); | ||
| 473 | } | ||
| 474 | |||