From 93a2565a19876ba998e57d7b41498c848675c19f Mon Sep 17 00:00:00 2001 From: Eileen McNaughton Date: Thu, 11 Nov 2021 10:50:02 +1300 Subject: [PATCH] Ensure userRecordUrl is always set --- CRM/Contact/Page/View.php | 6 +++--- templates/CRM/Contact/Page/Inline/Basic.tpl | 4 ++-- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/CRM/Contact/Page/View.php b/CRM/Contact/Page/View.php index 96dbb6bd7d..f891c0d6ac 100644 --- a/CRM/Contact/Page/View.php +++ b/CRM/Contact/Page/View.php @@ -328,16 +328,16 @@ class CRM_Contact_Page_View extends CRM_Core_Page { */ public static function addUrls(&$obj, $cid) { $uid = CRM_Core_BAO_UFMatch::getUFId($cid); - + $obj->assign('userRecordId', $uid); + $userRecordUrl = ''; if ($uid) { $userRecordUrl = CRM_Core_Config::singleton()->userSystem->getUserRecordUrl($cid); - $obj->assign('userRecordUrl', $userRecordUrl); - $obj->assign('userRecordId', $uid); } elseif (CRM_Core_Config::singleton()->userSystem->checkPermissionAddUser()) { $userAddUrl = CRM_Utils_System::url('civicrm/contact/view/useradd', 'reset=1&action=add&cid=' . $cid); $obj->assign('userAddUrl', $userAddUrl); } + $obj->assign('userRecordUrl', $userRecordUrl); if (CRM_Core_Permission::check('access Contact Dashboard')) { $dashboardURL = CRM_Utils_System::url('civicrm/user', diff --git a/templates/CRM/Contact/Page/Inline/Basic.tpl b/templates/CRM/Contact/Page/Inline/Basic.tpl index 05ed9b2e77..ac9bc24cf3 100644 --- a/templates/CRM/Contact/Page/Inline/Basic.tpl +++ b/templates/CRM/Contact/Page/Inline/Basic.tpl @@ -22,11 +22,11 @@
- {ts}Contact ID{/ts}{if !empty($userRecordUrl)} / {ts}User ID{/ts}{/if} + {ts}Contact ID{/ts}{if $userRecordUrl} / {ts}User ID{/ts}{/if}
{$contactId} - {if !empty($userRecordUrl)} + {if $userRecordUrl}  / {$userRecordId} -- 2.25.1