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 #17856 from civicrm/5.28
[civicrm-core.git]
/
CRM
/
Logging
/
Differ.php
diff --git
a/CRM/Logging/Differ.php
b/CRM/Logging/Differ.php
index 75c01b2bcfca9ac5b4325d5d3f21abb371405064..2e05cf1d709aefea5659112b236ff85e7b5bad20 100644
(file)
--- a/
CRM/Logging/Differ.php
+++ b/
CRM/Logging/Differ.php
@@
-231,7
+231,7
@@
WHERE lt.log_conn_id = %1
if (!empty(${$var[$diff]})) {
$holder =& $$var;
$val = explode(CRM_Case_BAO_Case::VALUE_SEPARATOR, $holder[$diff]);
if (!empty(${$var[$diff]})) {
$holder =& $$var;
$val = explode(CRM_Case_BAO_Case::VALUE_SEPARATOR, $holder[$diff]);
- $holder[$diff] =
CRM_Utils_Array::value(1, $val)
;
+ $holder[$diff] =
$val[1] ?? NULL
;
}
}
}
}
}
}
@@
-240,8
+240,8
@@
WHERE lt.log_conn_id = %1
'action' => $changed['log_action'],
'id' => $id,
'field' => $diff,
'action' => $changed['log_action'],
'id' => $id,
'field' => $diff,
- 'from' =>
CRM_Utils_Array::value($diff, $original)
,
- 'to' =>
CRM_Utils_Array::value($diff, $changed)
,
+ 'from' =>
$original[$diff] ?? NULL
,
+ 'to' =>
$changed[$diff] ?? NULL
,
'table' => $table,
'log_date' => $changed['log_date'],
'log_conn_id' => $changed['log_conn_id'],
'table' => $table,
'log_date' => $changed['log_date'],
'log_conn_id' => $changed['log_conn_id'],
@@
-306,7
+306,7
@@
WHERE lt.log_conn_id = %1
$dao = new $tableDAO();
foreach ($dao->fields() as $field) {
$dao = new $tableDAO();
foreach ($dao->fields() as $field) {
- $titles[$table][$field['name']] =
CRM_Utils_Array::value('title', $field)
;
+ $titles[$table][$field['name']] =
$field['title'] ?? NULL
;
if ($field['type'] == CRM_Utils_Type::T_BOOLEAN) {
$values[$table][$field['name']] = ['0' => ts('false'), '1' => ts('true')];
if ($field['type'] == CRM_Utils_Type::T_BOOLEAN) {
$values[$table][$field['name']] = ['0' => ts('false'), '1' => ts('true')];