Resolve bug 25580: pass $pageInfo along to finishImportPage when overriding the impor...

diff --git a/includes/api/ApiImport.php b/includes/api/ApiImport.php
index 5567db5..8c03106 100644 (file)
--- a/includes/api/ApiImport.php
+++ b/includes/api/ApiImport.php
@@ -181,7 +181,7 @@ class ApiImport extends ApiBase {
 class ApiImportReporter extends ImportReporter {
        private $mResultArr = array();
 
-       function reportPage( $title, $origTitle, $revisionCount, $successCount ) {
+       function reportPage( $title, $origTitle, $revisionCount, $successCount, $pageInfo ) {
                // Add a result entry
                $r = array();
                ApiQueryBase::addTitleInfo( $r, $title );
@@ -189,7 +189,7 @@ class ApiImportReporter extends ImportReporter {
                $this->mResultArr[] = $r;
 
                // Piggyback on the parent to do the logging
-               parent::reportPage( $title, $origTitle, $revisionCount, $successCount );
+               parent::reportPage( $title, $origTitle, $revisionCount, $successCount, $pageInfo );
        }
 
        function getData() {

diff --git a/includes/specials/SpecialImport.php b/includes/specials/SpecialImport.php
index 87e64ea..ae00e3f 100644 (file)
--- a/includes/specials/SpecialImport.php
+++ b/includes/specials/SpecialImport.php
@@ -307,7 +307,7 @@ class ImportReporter {
                }
        }
 
-       function reportPage( $title, $origTitle, $revisionCount, $successCount ) {
+       function reportPage( $title, $origTitle, $revisionCount, $successCount, $pageInfo ) {
                global $wgOut, $wgUser, $wgLang, $wgContLang;
                
                $args = func_get_args();