From 9c306ec18b7ea6e7164d5e4745e4fb5230591e22 Mon Sep 17 00:00:00 2001
From: eileen <emcnaughton@wikimedia.org>
Date: Tue, 28 Feb 2017 11:06:57 +1300
Subject: [PATCH] CRM-20157 code cleanup, more unused variables

---
 CRM/Contact/Form/Merge.php | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

diff --git a/CRM/Contact/Form/Merge.php b/CRM/Contact/Form/Merge.php
index ba90bf7ec0..da1d554491 100644
--- a/CRM/Contact/Form/Merge.php
+++ b/CRM/Contact/Form/Merge.php
@@ -109,7 +109,6 @@ class CRM_Contact_Form_Merge extends CRM_Core_Form {
     $config = CRM_Core_Config::singleton();
     $config->doNotResetCache = 1;
 
-    $viewUser = CRM_Core_Permission::check('access user profiles');
     $mainUfId = CRM_Core_BAO_UFMatch::getUFId($this->_cid);
     $mainUser = NULL;
     if ($mainUfId) {
@@ -167,8 +166,6 @@ class CRM_Contact_Form_Merge extends CRM_Core_Form {
     $cmsUser = ($mainUfId && $otherUfId) ? TRUE : FALSE;
     $this->assign('user', $cmsUser);
 
-    $session = CRM_Core_Session::singleton();
-
     $rowsElementsAndInfo = CRM_Dedupe_Merger::getRowsElementsAndInfo($this->_cid, $this->_oid);
     $main = $this->_mainDetails = $rowsElementsAndInfo['main_details'];
     $other = $this->_otherDetails = $rowsElementsAndInfo['other_details'];
@@ -225,7 +222,7 @@ class CRM_Contact_Form_Merge extends CRM_Core_Form {
     }
 
     $this->assign('rel_tables', $rowsElementsAndInfo['rel_tables']);
-    $this->assign('userContextURL', $session->readUserContext());
+    $this->assign('userContextURL', CRM_Core_Session::singleton()->readUserContext());
   }
 
   public function addRules() {
-- 
2.25.1