Merge "Export::dumpFrom() doesn't return any values, and hence neither do any of...
authorAaron Schulz <aschulz@wikimedia.org>
Mon, 9 Apr 2012 17:37:05 +0000 (17:37 +0000)
committerGerrit Code Review <gerrit@wikimedia.org>
Mon, 9 Apr 2012 17:37:06 +0000 (17:37 +0000)
1  2 
includes/Export.php

diff --combined includes/Export.php
@@@ -103,7 -103,7 +103,7 @@@ class WikiExporter 
         * the most recent version.
         */
        public function allPages() {
-               return $this->dumpFrom( '' );
+               $this->dumpFrom( '' );
        }
  
        /**
                if ( $end ) {
                        $condition .= ' AND page_id < ' . intval( $end );
                }
-               return $this->dumpFrom( $condition );
+               $this->dumpFrom( $condition );
        }
  
        /**
                if ( $end ) {
                        $condition .= ' AND rev_id < ' . intval( $end );
                }
-               return $this->dumpFrom( $condition );
+               $this->dumpFrom( $condition );
        }
  
        /**
         * @param $title Title
         */
        public function pageByTitle( $title ) {
-               return $this->dumpFrom(
+               $this->dumpFrom(
                        'page_namespace=' . $title->getNamespace() .
                        ' AND page_title=' . $this->db->addQuotes( $title->getDBkey() ) );
        }
                if ( is_null( $title ) ) {
                        throw new MWException( "Can't export invalid title" );
                } else {
-                       return $this->pageByTitle( $title );
+                       $this->pageByTitle( $title );
                }
        }
  
        }
  
        public function allLogs() {
-               return $this->dumpFrom( '' );
+               $this->dumpFrom( '' );
        }
  
        public function logsByRange( $start, $end ) {
                if ( $end ) {
                        $condition .= ' AND log_id < ' . intval( $end );
                }
-               return $this->dumpFrom( $condition );
+               $this->dumpFrom( $condition );
        }
  
        # Generates the distinct list of authors of an article
@@@ -910,7 -910,7 +910,7 @@@ class DumpFileOutput extends DumpOutpu
   */
  class DumpPipeOutput extends DumpFileOutput {
        protected $command, $filename;
 -      private $procOpenResource = false;
 +      protected $procOpenResource = false;
  
        function __construct( $command, $file = null ) {
                if ( !is_null( $file ) ) {