projects
/
civicrm-core.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
4ffd4cd
)
PHP 8.1 compatibility improvement
author
John Kingsnorth
<john@johnkingsnorth.co.uk>
Fri, 13 Jan 2023 12:06:54 +0000
(12:06 +0000)
committer
GitHub
<noreply@github.com>
Fri, 13 Jan 2023 12:06:54 +0000
(12:06 +0000)
CRM/Logging/Schema.php
patch
|
blob
|
blame
|
history
diff --git
a/CRM/Logging/Schema.php
b/CRM/Logging/Schema.php
index bbe7801f215a19228cd93a154a8fed57b6f9c24e..f1f5847cc4a2095e80dfb059f84dfc5f874ee0f2 100644
(file)
--- a/
CRM/Logging/Schema.php
+++ b/
CRM/Logging/Schema.php
@@
-743,7
+743,7
@@
WHERE table_schema IN ('{$this->db}', '{$civiDB}')";
}
elseif (
$civiTableSpecs[$col]['COLUMN_DEFAULT'] != ($logTableSpecs[$col]['COLUMN_DEFAULT'] ?? NULL)
- && !stristr(
$civiTableSpecs[$col]['COLUMN_DEFAULT']
, 'timestamp')
+ && !stristr(
($civiTableSpecs[$col]['COLUMN_DEFAULT'] ?? '')
, 'timestamp')
&& !($civiTableSpecs[$col]['COLUMN_DEFAULT'] === NULL && ($logTableSpecs[$col]['COLUMN_DEFAULT'] ?? NULL) === 'NULL')
) {
// if default property is different, and its not about a timestamp column, consider it