Merge "OOUIfy CheckMatrix in PHP and JS"

[lhc/web/wiklou.git] / includes / logging / LogEntry.php

diff --git a/includes/logging/LogEntry.php b/includes/logging/LogEntry.php
index e9e338d..b53a486 100644 (file)
--- a/includes/logging/LogEntry.php
+++ b/includes/logging/LogEntry.php
@@ -625,7 +625,7 @@ class ManualLogEntry extends LogEntryBase {
        /**
         * Insert the entry into the `logging` table.
         *
-        * @param IDatabase $dbw
+        * @param IDatabase|null $dbw
         * @return int ID of the log entry
         * @throws MWException
         */
@@ -821,7 +821,7 @@ class ManualLogEntry extends LogEntryBase {
        }
 
        public function getTimestamp() {
-               $ts = $this->timestamp !== null ? $this->timestamp : wfTimestampNow();
+               $ts = $this->timestamp ?? wfTimestampNow();
 
                return wfTimestamp( TS_MW, $ts );
        }