From: eileen <emcnaughton@wikimedia.org>
Date: Thu, 10 Nov 2016 03:49:24 +0000 (+1300)
Subject: (towards CRM-19492) Do not assign variables by reference
X-Git-Url: https://vcs.fsf.org/?a=commitdiff_plain;h=8ca36a6e714ba5cfd921eb73d32f995ffcc007e0;p=civicrm-core.git

(towards CRM-19492) Do not assign variables by reference

They are not used as references & this just adds confusion.
---

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'));