From 67414017364ded290e4558b873260ed610bb189d Mon Sep 17 00:00:00 2001 From: Eileen McNaughton Date: Tue, 9 Dec 2014 12:59:13 +1300 Subject: [PATCH] remove handling for legacy status bounce as not found anywhere in code --- CRM/Core/Invoke.php | 37 +++++++++++++++---------------------- 1 file changed, 15 insertions(+), 22 deletions(-) diff --git a/CRM/Core/Invoke.php b/CRM/Core/Invoke.php index 0bad37a681..4d87429b59 100644 --- a/CRM/Core/Invoke.php +++ b/CRM/Core/Invoke.php @@ -76,29 +76,22 @@ class CRM_Core_Invoke { catch (CRM_Core_EXCEPTION $e) { $params = $e->getErrorData(); $message = $e->getMessage(); - if (isset($params['legacy_status_bounce'])) { - //@todo remove this- see comments on - //https://github.com/eileenmcnaughton/civicrm-core/commit/ae686b09e2c987091612bb25ba0a58e520a203e7 - CRM_Core_Error::statusBounce($params['message']); - } - else { - $session = CRM_Core_Session::singleton(); - $session->setStatus( - $message, - CRM_Utils_Array::value('message_title', $params), - CRM_Utils_Array::value('message_type', $params, '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()) { - // 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']); + $session = CRM_Core_Session::singleton(); + $session->setStatus( + $message, + CRM_Utils_Array::value('message_title', $params), + CRM_Utils_Array::value('message_type', $params, '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()) { + // 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']); } } catch (Exception $e) { -- 2.25.1