Fixes for r64708:

[lhc/web/wiklou.git] / includes / specials / SpecialExport.php

diff --git a/includes/specials/SpecialExport.php b/includes/specials/SpecialExport.php
index 8a40e29..8a84826 100644 (file)
--- a/includes/specials/SpecialExport.php
+++ b/includes/specials/SpecialExport.php
@@ -44,18 +44,18 @@ class SpecialExport extends SpecialPage {
                $this->templates = $wgRequest->getCheck( 'templates' );
                $this->images = $wgRequest->getCheck( 'images' ); // Doesn't do anything yet
                $this->pageLinkDepth = $this->validateLinkDepth(
-                                                                                                               $wgRequest->getIntOrNull( 'pagelink-depth' ) );
+                       $wgRequest->getIntOrNull( 'pagelink-depth' ) );
                $nsindex = '';
                
                if ( $wgRequest->getCheck( 'addcat' ) ) {
                        $page = $wgRequest->getText( 'pages' );
                        $catname = $wgRequest->getText( 'catname' );
                        
-                       if ( $catname !== '' && $catname !== NULL && $catname !== false ) {
+                       if ( $catname !== '' && $catname !== null && $catname !== false ) {
                                $t = Title::makeTitleSafe( NS_MAIN, $catname );
                                if ( $t ) {
                                        /**
-                                        * @fixme This can lead to hitting memory limit for very large
+                                        * @todo Fixme: this can lead to hitting memory limit for very large
                                         * categories. Ideally we would do the lookup synchronously
                                         * during the export in a single query.
                                         */
@@ -70,11 +70,11 @@ class SpecialExport extends SpecialPage {
                        
                        if ( strval( $nsindex ) !== ''  ) {
                                /**
-                                * Same implementation as above, so same @fixme
+                                * Same implementation as above, so same @todo
                                 */
                                $nspages = $this->getPagesFromNamespace( $nsindex );
                                if ( $nspages ) $page .= "\n" . implode( "\n", $nspages );
-                       }       
+                       }
                }
                else if( $wgRequest->wasPosted() && $par == '' ) {
                        $page = $wgRequest->getText( 'pages' );
@@ -88,15 +88,15 @@ class SpecialExport extends SpecialPage {
                        $limit = $wgRequest->getInt( 'limit' );
                        $dir = $wgRequest->getVal( 'dir' );
                        $history = array(
-                                                        'dir' => 'asc',
-                                                        'offset' => false,
-                                                        'limit' => $wgExportMaxHistory,
-                                                        );
+                               'dir' => 'asc',
+                               'offset' => false,
+                               'limit' => $wgExportMaxHistory,
+                       );
                        $historyCheck = $wgRequest->getCheck( 'history' );
                        if ( $this->curonly ) {
                                $history = WikiExporter::CURRENT;
                        } elseif ( !$historyCheck ) {
-                               if ( $limit > 0 && $limit < $wgExportMaxHistory ) {
+                               if ( $limit > 0 && ($wgExportMaxHistory == 0 || $limit < $wgExportMaxHistory ) ) {
                                        $history['limit'] = $limit;
                                }
                                if ( !is_null( $offset ) ) {
@@ -134,7 +134,7 @@ class SpecialExport extends SpecialPage {
                        // Cancel output buffering and gzipping if set
                        // This should provide safer streaming for pages with history
                        wfResetOutputBuffers();
-                       header( "Content-type: application/xml; charset=utf-8" );
+                       $wgRequest->response()->header( "Content-type: application/xml; charset=utf-8" );
                        if( $wgRequest->getCheck( 'wpDownload' ) ) {
                                // Provide a sane filename suggestion
                                $filename = urlencode( $wgSitename . '-' . wfTimestampNow() . '.xml' );
@@ -147,7 +147,7 @@ class SpecialExport extends SpecialPage {
                $wgOut->addWikiMsg( 'exporttext' );
                
                $form = Xml::openElement( 'form', array( 'method' => 'post',
-                                                                                               'action' => $this->getTitle()->getLocalUrl( 'action=submit' ) ) );
+                       'action' => $this->getTitle()->getLocalUrl( 'action=submit' ) ) );
                $form .= Xml::inputLabel( wfMsg( 'export-addcattext' )    , 'catname', 'catname', 40 ) . '&nbsp;';
                $form .= Xml::submitButton( wfMsg( 'export-addcat' ), array( 'name' => 'addcat' ) ) . '<br />';
                
@@ -191,10 +191,22 @@ class SpecialExport extends SpecialPage {
        private function doExport( $page, $history, $list_authors ) {
                global $wgExportMaxHistory;
                
-               /* Split up the input and look up linked pages */
-               $inputPages = array_filter( explode( "\n", $page ), array( $this, 'filterPage' ) );
-               $pageSet = array_flip( $inputPages );
+               $pageSet = array(); // Inverted index of all pages to look up
                
+               // Split up and normalize input
+               foreach( explode( "\n", $page ) as $pageName ) {
+                       $pageName = trim( $pageName );
+                       $title = Title::newFromText( $pageName );
+                       if( $title && $title->getInterwiki() == '' && $title->getText() !== '' ) {
+                               // Only record each page once!
+                               $pageSet[$title->getPrefixedText()] = true;
+                       }
+               }
+               
+               // Set of original pages to pass on to further manipulation...
+               $inputPages = array_keys( $pageSet );
+               
+               // Look up any linked pages if asked...
                if( $this->templates ) {
                        $pageSet = $this->getTemplates( $inputPages, $pageSet );
                }
@@ -263,8 +275,7 @@ class SpecialExport extends SpecialPage {
                        $lb->closeAll();
                }
        }
-       
-       
+
        private function getPagesFromCategory( $title ) {
                global $wgContLang;
                
@@ -381,7 +392,7 @@ class SpecialExport extends SpecialPage {
                        $title = Title::newFromText( $page );
                        if( $title ) {
                                $pageSet[$title->getPrefixedText()] = true;
-                               /// @fixme May or may not be more efficient to batch these
+                               /// @todo Fixme: May or may not be more efficient to batch these
                                ///        by namespace when given multiple input pages.
                                $result = $dbr->select(
                                                                           array( 'page', $table ),
@@ -399,12 +410,5 @@ class SpecialExport extends SpecialPage {
                }
                return $pageSet;
        }
-       
-       /**
-        * Callback function to remove empty strings from the pages array.
-        */
-       private function filterPage( $page ) {
-               return $page !== '' && $page !== null;
-       }
 }