Merge pull request #22610 from colemanw/deprecatedUnusedFunction

[civicrm-core.git] / CRM / Core / LegacyErrorHandler.php

diff --git a/CRM/Core/LegacyErrorHandler.php b/CRM/Core/LegacyErrorHandler.php
index ae0f1f9859351ac4be8a127edc2003fb2676b575..de515ecee12ec0d5bd6ef988e742e1c24a3738b6 100644 (file)
--- a/CRM/Core/LegacyErrorHandler.php
+++ b/CRM/Core/LegacyErrorHandler.php
@@ -16,22 +16,10 @@ class CRM_Core_LegacyErrorHandler {
       $message = $e->getMessage();
       $session = CRM_Core_Session::singleton();
       $session->setStatus(
-        $message,
-        CRM_Utils_Array::value('message_title', $params),
-        CRM_Utils_Array::value('message_type', $params, 'error')
+        htmlspecialchars($message),
+        htmlspecialchars($params['message_title'] ?? ts('Error')),
+        $params['message_type'] ?? 'error'
       );
-
-      // @todo remove this code - legacy redirect path is an interim measure for moving redirects out of BAO
-      // to somewhere slightly more acceptable. they should not be part of the exception class & should
-      // be managed @ the form level - if you find a form that is triggering this piece of code
-      // you should log a ticket for it to be removed with details about the form you were on.
-      if (!empty($params['legacy_redirect_path'])) {
-        if (CRM_Utils_System::isDevelopment()) {
-          $intentionalENotice = "How did you get HERE?! - Please log in JIRA";
-          // here we could set a message telling devs to log it per above
-        }
-        CRM_Utils_System::redirect($params['legacy_redirect_path'], $params['legacy_redirect_query']);
-      }
     }
   }