From 95edd12d429483e4a44906ad70df2eb2cfda3ec4 Mon Sep 17 00:00:00 2001 From: Andrew Garrett Date: Wed, 10 Nov 2010 00:54:19 +0000 Subject: [PATCH] Resolve bug 25580: pass $pageInfo along to finishImportPage when overriding the import code --- includes/api/ApiImport.php | 4 ++-- includes/specials/SpecialImport.php | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/includes/api/ApiImport.php b/includes/api/ApiImport.php index 5567db52c2..8c031061b4 100644 --- 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 87e64eaee9..ae00e3f48c 100644 --- 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(); -- 2.20.1