Test cases working with “make tap” but not just “phpunit” right now.

[lhc/web/wiklou.git] / maintenance / refreshLinks.php

diff --git a/maintenance/refreshLinks.php b/maintenance/refreshLinks.php
index c75554e..863dd02 100644 (file)
--- a/maintenance/refreshLinks.php
+++ b/maintenance/refreshLinks.php
@@ -30,7 +30,7 @@ class RefreshLinks extends Maintenance {
                $this->addOption( 'old-redirects-only', 'Only fix redirects with no redirect table entry' );
                $this->addOption( 'm', 'Maximum replication lag', false, true );
                $this->addOption( 'e', 'Last page id to refresh', false, true );
-               $this->addArg( 'start', 'Page_id to start from, default 1' );
+               $this->addArg( 'start', 'Page_id to start from, default 1', false );
                $this->setBatchSize( 100 );
        }
 
@@ -123,7 +123,9 @@ class RefreshLinks extends Maintenance {
                        }
                } else {
                        if ( !$end ) {
-                               $end = $dbr->selectField( 'page', 'max(page_id)', false );
+                               $maxPage = $dbr->selectField( 'page', 'max(page_id)', false );
+                               $maxRD = $dbr->selectField( 'redirect', 'max(rd_from)', false );
+                               $end = max( $maxPage, $maxRD );
                        }
                        $this->output( "Refreshing redirects table.\n" );
                        $this->output( "Starting from page_id $start of $end.\n" );
@@ -164,16 +166,24 @@ class RefreshLinks extends Maintenance {
                $dbw = wfGetDB( DB_MASTER );
        
                if ( is_null( $wgTitle ) ) {
+                       // This page doesn't exist (any more)
+                       // Delete any redirect table entry for it
+                       $dbw->delete( 'redirect', array( 'rd_from' => $id ),
+                               __METHOD__ );
                        return;
                }
                $wgArticle = new Article($wgTitle);
        
                $rt = $wgArticle->followRedirect();
        
-               if($rt == false || !is_object($rt))
-                       return;
-       
-               $wgArticle->updateRedirectOn($dbw,$rt);
+               if($rt == false || !is_object($rt)) {
+                       // $wgTitle is not a redirect
+                       // Delete any redirect table entry for it
+                       $dbw->delete( 'redirect', array( 'rd_from' => $id ),
+                               __METHOD__ );
+               } else {
+                       $wgArticle->updateRedirectOn($dbw,$rt);
+               }
        }
 
        /**
@@ -203,7 +213,7 @@ class RefreshLinks extends Maintenance {
                $parserOutput = $wgParser->parse( $revision->getText(), $wgTitle, $options, true, true, $revision->getId() );
                $update = new LinksUpdate( $wgTitle, $parserOutput, false );
                $update->doUpdate();
-               $dbw->immediateCommit();
+               $dbw->commit();
        }
 
        /*