projects
/
civicrm-core.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge pull request #20308 from masetto/master
[civicrm-core.git]
/
CRM
/
Member
/
Page
/
UserDashboard.php
diff --git
a/CRM/Member/Page/UserDashboard.php
b/CRM/Member/Page/UserDashboard.php
index 95759377f519baa2415f4504624ae59eb0a03321..3fcb435fc17e48a0ccb1b5be46b9293b289d7691 100644
(file)
--- a/
CRM/Member/Page/UserDashboard.php
+++ b/
CRM/Member/Page/UserDashboard.php
@@
-13,8
+13,6
@@
*
* @package CRM
* @copyright CiviCRM LLC https://civicrm.org/licensing
*
* @package CRM
* @copyright CiviCRM LLC https://civicrm.org/licensing
- * $Id$
- *
*/
/**
*/
/**
@@
-43,7
+41,7
@@
class CRM_Member_Page_UserDashboard extends CRM_Contact_Page_View_UserDashBoard
'status',
'membership_type',
] as $fld) {
'status',
'membership_type',
] as $fld) {
- $membership[$dao->id][$fld] =
CRM_Utils_Array::value($fld, $statusANDType[$dao->id])
;
+ $membership[$dao->id][$fld] =
$statusANDType[$dao->id][$fld] ?? NULL
;
}
if (!empty($statusANDType[$dao->id]['is_current_member'])) {
$membership[$dao->id]['active'] = TRUE;
}
if (!empty($statusANDType[$dao->id]['is_current_member'])) {
$membership[$dao->id]['active'] = TRUE;