r76420 MediaWiki - Code Review archive

Repository:MediaWiki
Revision:r76419‎ | r76420 | r76421 >
Date:00:54, 10 November 2010
Author:werdna
Status:ok
Tags:
Comment:
Resolve bug 25580: pass $pageInfo along to finishImportPage when overriding the import code
Modified paths:
  • /trunk/phase3/includes/api/ApiImport.php (modified) (history)
  • /trunk/phase3/includes/specials/SpecialImport.php (modified) (history)

Diff [purge]

Index: trunk/phase3/includes/api/ApiImport.php
@@ -181,7 +181,7 @@
182182 class ApiImportReporter extends ImportReporter {
183183 private $mResultArr = array();
184184
185 - function reportPage( $title, $origTitle, $revisionCount, $successCount ) {
 185+ function reportPage( $title, $origTitle, $revisionCount, $successCount, $pageInfo ) {
186186 // Add a result entry
187187 $r = array();
188188 ApiQueryBase::addTitleInfo( $r, $title );
@@ -189,7 +189,7 @@
190190 $this->mResultArr[] = $r;
191191
192192 // Piggyback on the parent to do the logging
193 - parent::reportPage( $title, $origTitle, $revisionCount, $successCount );
 193+ parent::reportPage( $title, $origTitle, $revisionCount, $successCount, $pageInfo );
194194 }
195195
196196 function getData() {
Index: trunk/phase3/includes/specials/SpecialImport.php
@@ -307,7 +307,7 @@
308308 }
309309 }
310310
311 - function reportPage( $title, $origTitle, $revisionCount, $successCount ) {
 311+ function reportPage( $title, $origTitle, $revisionCount, $successCount, $pageInfo ) {
312312 global $wgOut, $wgUser, $wgLang, $wgContLang;
313313
314314 $args = func_get_args();

Status & tagging log