X-Git-Url: http://git.heureux-cyclage.org/?a=blobdiff_plain;f=maintenance%2FfixTimestamps.php;h=796ec2658ea299ca6c6f9b14e03cdc4405c68e59;hb=09110719680d7a0646a454ff1b2633a042952003;hp=b0609d1768b3df69a1d6e5f1504da49be2b3e9d3;hpb=0898fa993ca5d51e11adaf4dc57e3ef757bc8c69;p=lhc%2Fweb%2Fwiklou.git diff --git a/maintenance/fixTimestamps.php b/maintenance/fixTimestamps.php index b0609d1768..796ec2658e 100644 --- a/maintenance/fixTimestamps.php +++ b/maintenance/fixTimestamps.php @@ -36,7 +36,7 @@ require_once __DIR__ . '/Maintenance.php'; class FixTimestamps extends Maintenance { public function __construct() { parent::__construct(); - $this->mDescription = ""; + $this->addDescription( '' ); $this->addArg( 'offset', '' ); $this->addArg( 'start', 'Starting timestamp' ); $this->addArg( 'end', 'Ending timestamp' ); @@ -49,7 +49,7 @@ class FixTimestamps extends Maintenance { $grace = 60; // maximum normal clock offset # Find bounding revision IDs - $dbw = wfGetDB( DB_MASTER ); + $dbw = $this->getDB( DB_MASTER ); $revisionTable = $dbw->tableName( 'revision' ); $res = $dbw->query( "SELECT MIN(rev_id) as minrev, MAX(rev_id) as maxrev FROM $revisionTable " . "WHERE rev_timestamp BETWEEN '{$start}' AND '{$end}'", __METHOD__ ); @@ -75,7 +75,7 @@ class FixTimestamps extends Maintenance { $res = $dbw->query( $sql, __METHOD__ ); $lastNormal = 0; - $badRevs = array(); + $badRevs = []; $numGoodRevs = 0; foreach ( $res as $row ) { @@ -85,11 +85,11 @@ class FixTimestamps extends Maintenance { if ( $sign == 0 || $sign == $expectedSign ) { // Monotonic change $lastNormal = $timestamp; - ++ $numGoodRevs; + ++$numGoodRevs; continue; } elseif ( abs( $delta ) <= $grace ) { // Non-monotonic change within grace interval - ++ $numGoodRevs; + ++$numGoodRevs; continue; } else { // Non-monotonic change larger than grace interval @@ -100,7 +100,7 @@ class FixTimestamps extends Maintenance { $numBadRevs = count( $badRevs ); if ( $numBadRevs > $numGoodRevs ) { $this->error( - "The majority of revisions in the search interval are marked as bad. + "The majority of revisions in the search interval are marked as bad. Are you sure the offset ($offset) has the right sign? Positive means the clock was incorrectly set forward, negative means the clock was incorrectly set back. @@ -117,7 +117,8 @@ class FixTimestamps extends Maintenance { $fixup = -$offset; $sql = "UPDATE $revisionTable " . - "SET rev_timestamp=DATE_FORMAT(DATE_ADD(rev_timestamp, INTERVAL $fixup SECOND), '%Y%m%d%H%i%s') " . + "SET rev_timestamp=" + . "DATE_FORMAT(DATE_ADD(rev_timestamp, INTERVAL $fixup SECOND), '%Y%m%d%H%i%s') " . "WHERE rev_id IN (" . $dbw->makeList( $badRevs ) . ')'; $dbw->query( $sql, __METHOD__ ); $this->output( "Done\n" );