From 8bb0117562c6089c0f880ad8e1a6c53bcb2dc116 Mon Sep 17 00:00:00 2001 From: Seamus Lee Date: Thu, 11 Aug 2016 10:29:58 +0000 Subject: [PATCH] CRM-19092 move switch to fix for CRM-17844 --- CRM/Core/Form.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/CRM/Core/Form.php b/CRM/Core/Form.php index 447c4e315e..dd6a59cc63 100644 --- a/CRM/Core/Form.php +++ b/CRM/Core/Form.php @@ -1584,7 +1584,7 @@ class CRM_Core_Form extends HTML_QuickForm_Page { */ public function getContactID() { $tempID = CRM_Utils_Request::retrieve('cid', 'Positive', $this); - if (isset($this->_params) && isset($this->_params['select_contact_id'])) { + if (isset($this->_params) && !empty($this->_params['select_contact_id'])) { $tempID = $this->_params['select_contact_id']; } if (isset($this->_params, $this->_params[0]) && !empty($this->_params[0]['select_contact_id'])) { @@ -1593,7 +1593,7 @@ class CRM_Core_Form extends HTML_QuickForm_Page { } // force to ignore the authenticated user - if ($tempID === '0' || $tempID === 0 || $tempID === '') { + if ($tempID === '0' || $tempID === 0) { // we set the cid on the form so that this will be retained for the Confirm page // in the multi-page form & prevent us returning the $userID when this is called // from that page -- 2.25.1