Revert "merged master"

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

diff --git a/maintenance/dumpLinks.php b/maintenance/dumpLinks.php
index 1cb70d0..ad440e7 100644 (file)
--- a/maintenance/dumpLinks.php
+++ b/maintenance/dumpLinks.php
@@ -1,8 +1,5 @@
 <?php
 /**
- * Copyright (C) 2005 Brion Vibber <brion@pobox.com>
- * http://www.mediawiki.org/
- *
  * Quick demo hack to generate a plaintext link dump,
  * per the proposed wiki link database standard:
  * http://www.usemod.com/cgi-bin/mb.pl?LinkDatabase
@@ -11,6 +8,9 @@
  * Does not include interwiki or URL links.
  * Dumps ASCII text to stdout; command-line.
  *
+ * Copyright © 2005 Brion Vibber <brion@pobox.com>
+ * http://www.mediawiki.org/
+ *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
  * the Free Software Foundation; either version 2 of the License, or
@@ -26,11 +26,17 @@
  * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
  * http://www.gnu.org/copyleft/gpl.html
  *
- * @ingroup Mainatenance
+ * @file
+ * @ingroup Maintenance
  */
 
-require_once( dirname(__FILE__) . '/Maintenance.php' );
+require_once( dirname( __FILE__ ) . '/Maintenance.php' );
 
+/**
+ * Maintenance script that generates a plaintext link dump.
+ *
+ * @ingroup Maintenance
+ */
 class DumpLinks extends Maintenance {
        public function __construct() {
                parent::__construct();
@@ -49,11 +55,11 @@ class DumpLinks extends Maintenance {
                        array( 'page_id=pl_from' ),
                        __METHOD__,
                        array( 'ORDER BY' => 'page_id' ) );
-       
+
                $lastPage = null;
-               while( $row = $dbr->fetchObject( $result ) ) {
-                       if( $lastPage != $row->page_id ) {
-                               if( isset( $lastPage ) ) {
+               foreach ( $result as $row ) {
+                       if ( $lastPage != $row->page_id ) {
+                               if ( isset( $lastPage ) ) {
                                        $this->output( "\n" );
                                }
                                $page = Title::makeTitle( $row->page_namespace, $row->page_title );
@@ -63,11 +69,11 @@ class DumpLinks extends Maintenance {
                        $link = Title::makeTitle( $row->pl_namespace, $row->pl_title );
                        $this->output( " " . $link->getPrefixedUrl() );
                }
-               if( isset( $lastPage ) )
+               if ( isset( $lastPage ) )
                        $this->output( "\n" );
        }
 }
 
 $maintClass = "DumpLinks";
-require_once( DO_MAINTENANCE );
+require_once( RUN_MAINTENANCE_IF_MAIN );