From 8ca36a6e714ba5cfd921eb73d32f995ffcc007e0 Mon Sep 17 00:00:00 2001 From: eileen Date: Thu, 10 Nov 2016 16:49:24 +1300 Subject: [PATCH] (towards CRM-19492) Do not assign variables by reference They are not used as references & this just adds confusion. --- CRM/Contact/Form/Merge.php | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/CRM/Contact/Form/Merge.php b/CRM/Contact/Form/Merge.php index 503acfcb9d..cb529b5027 100644 --- a/CRM/Contact/Form/Merge.php +++ b/CRM/Contact/Form/Merge.php @@ -95,7 +95,7 @@ class CRM_Contact_Form_Merge extends CRM_Core_Form { } $this->assign('browseUrl', $browseUrl); if ($browseUrl) { - $session->pushUserContext($browseUrl); + CRM_Core_Session::singleton()->pushUserContext($browseUrl); } $cacheKey = CRM_Dedupe_Merger::getMergeCacheKeyString($this->_rgid, $gid); @@ -170,8 +170,8 @@ class CRM_Contact_Form_Merge extends CRM_Core_Form { $session = CRM_Core_Session::singleton(); $rowsElementsAndInfo = CRM_Dedupe_Merger::getRowsElementsAndInfo($cid, $oid); - $main = $this->_mainDetails = &$rowsElementsAndInfo['main_details']; - $other = $this->_otherDetails = &$rowsElementsAndInfo['other_details']; + $main = $this->_mainDetails = $rowsElementsAndInfo['main_details']; + $other = $this->_otherDetails = $rowsElementsAndInfo['other_details']; if ($main['contact_id'] != $cid) { CRM_Core_Error::fatal(ts('The main contact record does not exist')); -- 2.25.1