X-Git-Url: https://git.heureux-cyclage.org/?a=blobdiff_plain;f=maintenance%2Fincludes%2FTextPassDumper.php;h=f9b395111393100b56cd60c920ec927f5e2c2d22;hb=9d37c792b2ee408b6a01b43a1a649e6074c11c34;hp=b37fec188eb77acc644179ca4115b82544016522;hpb=2e0cf0891444367942677692cf8efde87f19c3ef;p=lhc%2Fweb%2Fwiklou.git diff --git a/maintenance/includes/TextPassDumper.php b/maintenance/includes/TextPassDumper.php index b37fec188e..f9b3951113 100644 --- a/maintenance/includes/TextPassDumper.php +++ b/maintenance/includes/TextPassDumper.php @@ -373,11 +373,13 @@ TEXT $pageRatePart = '-'; $revRatePart = '-'; } + + $dbDomain = WikiMap::getCurrentWikiDbDomain()->getId(); $this->progress( sprintf( "%s: %s (ID %d) %d pages (%0.1f|%0.1f/sec all|curr), " . "%d revs (%0.1f|%0.1f/sec all|curr), %0.1f%%|%0.1f%% " . "prefetched (all|curr), ETA %s [max %d]", - $now, wfWikiID(), $this->ID, $this->pageCount, $pageRate, + $now, $dbDomain, $this->ID, $this->pageCount, $pageRate, $pageRatePart, $this->revCount, $revRate, $revRatePart, $fetchRate, $fetchRatePart, $etats, $this->maxCount ) ); @@ -757,6 +759,7 @@ TEXT function openSpawn() { global $IP; + $wiki = WikiMap::getWikiIdFromDbDomain( WikiMap::getCurrentWikiDbDomain() ); if ( count( $this->php ) == 2 ) { $mwscriptpath = $this->php[1]; } else { @@ -769,14 +772,14 @@ TEXT $this->php[0], $mwscriptpath, "fetchText.php", - '--wiki', wfWikiID() ] ) ); + '--wiki', $wiki ] ) ); } else { $cmd = implode( " ", array_map( [ Shell::class, 'escape' ], [ $this->php[0], "$IP/maintenance/fetchText.php", - '--wiki', wfWikiID() ] ) ); + '--wiki', $wiki ] ) ); } $spec = [ 0 => [ "pipe", "r" ],