X-Git-Url: https://vcs.fsf.org/?a=blobdiff_plain;f=CRM%2FContact%2FForm%2FMerge.php;h=8f7d48535f4f6a77bbda9dff2caf2ef1476bf331;hb=d076584a95ac0d5421a991bdd24807a36b235e58;hp=2c6a299186ef141358d34efc6f17f61d8fade3fd;hpb=37f058e60a90cf2cd91e000bf09a58fde2c9def3;p=civicrm-core.git diff --git a/CRM/Contact/Form/Merge.php b/CRM/Contact/Form/Merge.php index 2c6a299186..8f7d48535f 100644 --- a/CRM/Contact/Form/Merge.php +++ b/CRM/Contact/Form/Merge.php @@ -1,7 +1,7 @@ _gid = $gid = CRM_Utils_Request::retrieve('gid', 'Positive', $this, FALSE); $this->_mergeId = CRM_Utils_Request::retrieve('mergeId', 'Positive', $this, FALSE); $this->limit = CRM_Utils_Request::retrieve('limit', 'Positive', $this, FALSE); + $this->criteria = CRM_Utils_Request::retrieve('criteria', 'Json', $this, FALSE, '{}'); - $urlParams = ['reset' => 1, 'rgid' => $this->_rgid, 'gid' => $this->_gid, 'limit' => $this->limit]; + $urlParams = ['reset' => 1, 'rgid' => $this->_rgid, 'gid' => $this->_gid, 'limit' => $this->limit, 'criteria' => $this->criteria]; $this->bounceIfInvalid($this->_cid, $this->_oid); @@ -100,7 +106,7 @@ class CRM_Contact_Form_Merge extends CRM_Core_Form { CRM_Core_Session::singleton()->pushUserContext($browseUrl); } - $cacheKey = CRM_Dedupe_Merger::getMergeCacheKeyString($this->_rgid, $gid); + $cacheKey = CRM_Dedupe_Merger::getMergeCacheKeyString($this->_rgid, $gid, json_decode($this->criteria, TRUE)); $join = CRM_Dedupe_Merger::getJoinOnDedupeTable(); $where = "de.id IS NULL"; @@ -114,16 +120,9 @@ class CRM_Contact_Form_Merge extends CRM_Core_Form { $mainUfId = CRM_Core_BAO_UFMatch::getUFId($this->_cid); $mainUser = NULL; if ($mainUfId) { - // d6 compatible - if ($config->userSystem->is_drupal == '1') { - $mainUser = user_load($mainUfId); - } - elseif ($config->userFramework == 'Joomla') { - $mainUser = JFactory::getUser($mainUfId); - } - + $mainUser = $config->userSystem->getUser($this->_cid); $this->assign('mainUfId', $mainUfId); - $this->assign('mainUfName', $mainUser ? $mainUser->name : NULL); + $this->assign('mainUfName', $mainUser ? $mainUser['name'] : NULL); } $flipParams = array_merge($urlParams, ['action' => 'update', 'cid' => $this->_oid, 'oid' => $this->_cid]); if (!$flip) { @@ -158,16 +157,9 @@ class CRM_Contact_Form_Merge extends CRM_Core_Form { $otherUser = NULL; if ($otherUfId) { - // d6 compatible - if ($config->userSystem->is_drupal == '1') { - $otherUser = user_load($otherUfId); - } - elseif ($config->userFramework == 'Joomla') { - $otherUser = JFactory::getUser($otherUfId); - } - + $otherUser = $config->userSystem->getUser($this->_oid); $this->assign('otherUfId', $otherUfId); - $this->assign('otherUfName', $otherUser ? $otherUser->name : NULL); + $this->assign('otherUfName', $otherUser ? $otherUser['name'] : NULL); } $cmsUser = ($mainUfId && $otherUfId) ? TRUE : FALSE; @@ -244,7 +236,7 @@ class CRM_Contact_Form_Merge extends CRM_Core_Form { 'type' => 'next', 'name' => $this->next ? ts('Merge and go to Next Pair') : ts('Merge'), 'isDefault' => TRUE, - 'icon' => $this->next ? 'circle-triangle-e' : 'check', + 'icon' => $this->next ? 'fa-play-circle' : 'check', ); if ($this->next || $this->prev) { @@ -300,7 +292,7 @@ class CRM_Contact_Form_Merge extends CRM_Core_Form { $message = '