summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGreg Roach <fisharebest@webtrees.net>2019-03-10 19:06:30 +0000
committerGreg Roach <fisharebest@webtrees.net>2019-03-10 19:06:30 +0000
commit12ebd7241f3499d70c7afe10d2aa30b8a4313240 (patch)
tree9515947a67798153971239cbbbf54825ba0ee799
parente6bcfa02ed9fcf5302d732668830a57cc49f94e2 (diff)
downloadwebtrees-12ebd7241f3499d70c7afe10d2aa30b8a4313240.tar.gz
webtrees-12ebd7241f3499d70c7afe10d2aa30b8a4313240.tar.bz2
webtrees-12ebd7241f3499d70c7afe10d2aa30b8a4313240.zip
Fix: we cannot nicely handle boot errors in custom modules as we have no framework to display them
-rw-r--r--app/Services/ModuleService.php12
1 files 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];
+ });
}
/**