Merge "Fix issue in SpecialCachedPage: only save cache when initialized"

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

diff --git a/maintenance/refreshLinks.php b/maintenance/refreshLinks.php
index 420f555..b5aa85f 100644 (file)
--- a/maintenance/refreshLinks.php
+++ b/maintenance/refreshLinks.php
@@ -107,7 +107,7 @@ class RefreshLinks extends Maintenance {
                        foreach ( $res as $row ) {
                                if ( !( ++$i % $reportingInterval ) ) {
                                        $this->output( "$i\n" );
-                                       wfWaitForSlaves( $maxLag );
+                                       wfWaitForSlaves();
                                }
                                $this->fixRedirect( $row->page_id );
                        }
@@ -127,7 +127,7 @@ class RefreshLinks extends Maintenance {
                        foreach ( $res as $row ) {
                                if ( !( ++$i % $reportingInterval ) ) {
                                        $this->output( "$i\n" );
-                                       wfWaitForSlaves( $maxLag );
+                                       wfWaitForSlaves();
                                }
                                if ( $redirectsOnly ) {
                                        $this->fixRedirect( $row->page_id );
@@ -148,7 +148,7 @@ class RefreshLinks extends Maintenance {
 
                                if ( !( $id % $reportingInterval ) ) {
                                        $this->output( "$id\n" );
-                                       wfWaitForSlaves( $maxLag );
+                                       wfWaitForSlaves();
                                }
                                $this->fixRedirect( $id );
                        }
@@ -161,7 +161,7 @@ class RefreshLinks extends Maintenance {
 
                                        if ( !( $id % $reportingInterval ) ) {
                                                $this->output( "$id\n" );
-                                               wfWaitForSlaves( $maxLag );
+                                               wfWaitForSlaves();
                                        }
                                        self::fixLinksFromArticle( $id );
                                }
@@ -174,27 +174,24 @@ class RefreshLinks extends Maintenance {
         * @param $id int The page_id of the redirect
         */
        private function fixRedirect( $id ) {
-               $title = Title::newFromID( $id );
+               $page = WikiPage::newFromID( $id );
                $dbw = wfGetDB( DB_MASTER );
 
-               if ( is_null( $title ) ) {
+               if ( $page === null ) {
                        // This page doesn't exist (any more)
                        // Delete any redirect table entry for it
                        $dbw->delete( 'redirect', array( 'rd_from' => $id ),
                                __METHOD__ );
                        return;
                }
-               $article = new Article( $title );
 
-               $rt = $article->followRedirect();
+               $rt = $page->getRedirectTarget();
 
-               if ( !$rt || !is_object( $rt ) ) {
-                       // $title is not a redirect
+               if ( $rt === null ) {
+                       // The page is not a redirect
                        // Delete any redirect table entry for it
                        $dbw->delete( 'redirect', array( 'rd_from' => $id ),
                                __METHOD__ );
-               } else {
-                       $article->updateRedirectOn( $dbw, $rt );
                }
        }
 
@@ -203,41 +200,43 @@ class RefreshLinks extends Maintenance {
         * @param $id int The page_id
         */
        public static function fixLinksFromArticle( $id ) {
-               global $wgParser;
+               global $wgParser, $wgContLang;
 
-               $title = Title::newFromID( $id );
-               $dbw = wfGetDB( DB_MASTER );
+               $page = WikiPage::newFromID( $id );
 
                LinkCache::singleton()->clear();
 
-               if ( is_null( $title ) ) {
+               if ( $page === null ) {
                        return;
                }
-               $dbw->begin();
 
-               $revision = Revision::newFromTitle( $title );
-               if ( !$revision ) {
+               $text = $page->getRawText();
+               if ( $text === false ) {
                        return;
                }
 
-               $options = new ParserOptions;
-               $parserOutput = $wgParser->parse( $revision->getText(), $title, $options, true, true, $revision->getId() );
-               $update = new LinksUpdate( $title, $parserOutput, false );
+               $dbw = wfGetDB( DB_MASTER );
+               $dbw->begin( __METHOD__ );
+
+               $options = ParserOptions::newFromUserAndLang( new User, $wgContLang );
+               $parserOutput = $wgParser->parse( $text, $page->getTitle(), $options, true, true, $page->getLatest() );
+               $update = new LinksUpdate( $page->getTitle(), $parserOutput, false );
                $update->doUpdate();
-               $dbw->commit();
+
+               $dbw->commit( __METHOD__ );
        }
 
-       /*
+       /**
         * Removes non-existing links from pages from pagelinks, imagelinks,
-        * categorylinks, templatelinks and externallinks tables.
+        * categorylinks, templatelinks, externallinks, interwikilinks, langlinks and redirect tables.
         *
-        * @param $maxLag
-        * @param $batchSize The size of deletion batches
+        * @param $maxLag int
+        * @param $batchSize int The size of deletion batches
         *
         * @author Merlijn van Deen <valhallasw@arctus.nl>
         */
        private function deleteLinksFromNonexistent( $maxLag = 0, $batchSize = 100 ) {
-               wfWaitForSlaves( $maxLag );
+               wfWaitForSlaves();
 
                $dbw = wfGetDB( DB_MASTER );
 
@@ -251,6 +250,10 @@ class RefreshLinks extends Maintenance {
                        'categorylinks' => 'cl_from',
                        'templatelinks' => 'tl_from',
                        'externallinks' => 'el_from',
+                       'iwlinks' => 'iwl_from',
+                       'langlinks' => 'll_from',
+                       'redirect' => 'rd_from',
+                       'page_props' => 'pp_page',
                );
 
                foreach ( $linksTables as $table => $field ) {
@@ -268,12 +271,11 @@ class RefreshLinks extends Maintenance {
                        $counter = 0;
                        $list = array();
                        $this->output( "0.." );
-
                        foreach ( $results as $row ) {
                                $counter++;
                                $list[] = $row->$field;
                                if ( ( $counter % $batchSize ) == 0 ) {
-                                       wfWaitForSlaves( 5 );
+                                       wfWaitForSlaves();
                                        $dbw->delete( $table, array( $field => $list ), __METHOD__ );
 
                                        $this->output( $counter . ".." );
@@ -285,6 +287,7 @@ class RefreshLinks extends Maintenance {
                                $dbw->delete( $table, array( $field => $list ), __METHOD__ );
                        }
                        $this->output( "\n" );
+                       wfWaitForSlaves();
                }
                $lb->closeAll();
        }