Fix import logging

LogEntry::setAssociatedRevId needs to be called before inserting,
otherwise log_params and log_search won't contain it. Also, set change
tags before inserting as well.

Bug: T191271
Change-Id: I190e58b015df90929d161d0def148851098a2542

diff --git a/includes/specials/helpers/ImportReporter.php b/includes/specials/helpers/ImportReporter.php
index 63addb8..c79e87c 100644 (file)
--- a/includes/specials/helpers/ImportReporter.php
+++ b/includes/specials/helpers/ImportReporter.php
@@ -158,15 +158,13 @@ class ImportReporter extends ContextSource {
                        $logEntry->setComment( $this->reason );
                        $logEntry->setPerformer( $this->getUser() );
                        $logEntry->setParameters( $logParams );
-                       $logid = $logEntry->insert();
+                       // Make sure the null revision will be tagged as well
+                       $logEntry->setAssociatedRevId( $nullRevId );
                        if ( count( $this->logTags ) ) {
                                $logEntry->setTags( $this->logTags );
                        }
-                       // Make sure the null revision will be tagged as well
-                       $logEntry->setAssociatedRevId( $nullRevId );
-
+                       $logid = $logEntry->insert();
                        $logEntry->publish( $logid );
-
                } else {
                        $this->getOutput()->addHTML( "<li>" . $linkRenderer->makeKnownLink( $title ) . " " .
                                $this->msg( 'import-nonewrevisions' )->escaped() . "</li>\n" );