From 12ebd7241f3499d70c7afe10d2aa30b8a4313240 Mon Sep 17 00:00:00 2001
From: Greg Roach <fisharebest@webtrees.net>
Date: Sun, 10 Mar 2019 19:06:30 +0000
Subject: Fix: we cannot nicely handle boot errors in custom modules as we have
 no framework to display them

---
 app/Services/ModuleService.php | 12 +++++++-----
 1 file changed, 7 insertions(+), 5 deletions(-)

diff --git a/app/Services/ModuleService.php b/app/Services/ModuleService.php
index 9c85eca87b..7ba90343ea 100644
--- a/app/Services/ModuleService.php
+++ b/app/Services/ModuleService.php
@@ -323,13 +323,15 @@ class ModuleService
 
                     return $module;
                 } catch (Throwable $ex) {
-                    $message = '<pre>' . e($ex->getMessage()) . "\n" . e($ex->getTraceAsString()) . '</pre>';
-                    FlashMessages::addMessage($message, 'danger');
-
-                    return null;
+                    // It would be nice to show this error in a flash-message or similar, but the framework
+                    // has not yet been initialised so we have no themes, languages, sessions, etc.
+                    throw $ex;
                 }
             })
-            ->filter();
+            ->filter()
+            ->mapWithKeys(function (ModuleCustomInterface $module): array {
+                return [$module->name() => $module];
+            });
     }
 
     /**
-- 
cgit v1.3