diff --git a/modules/backend/widgets/Search.php b/modules/backend/widgets/Search.php index 2f5749abf..8e554fb21 100644 --- a/modules/backend/widgets/Search.php +++ b/modules/backend/widgets/Search.php @@ -128,7 +128,14 @@ class Search extends WidgetBase * Trigger class event, merge results as viewable array */ $params = func_get_args(); - $result = $this->fireEvent('search.submit', [$params]); + try { + $result = $this->fireEvent('search.submit', [$params]); + } catch (\Throwable $e) { + // Remove the search term from the session if the search has failed. + $this->setActiveTerm(''); + throw $e; + } + if ($result && is_array($result)) { return call_user_func_array('array_merge', $result); }