German localisation updates, patch by ray.

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

diff --git a/includes/SpecialExport.php b/includes/SpecialExport.php
index a3a7649..ec36a64 100644 (file)
--- a/includes/SpecialExport.php
+++ b/includes/SpecialExport.php
@@ -57,7 +57,7 @@ function wfExportGetPagesFromCategory( $title ) {
  */
 function wfExportGetTemplates( $inputPages, $pageSet ) {
        return wfExportGetLinks( $inputPages, $pageSet,
-               'templatelinks', 
+               'templatelinks',
                array( 'tl_namespace AS namespace', 'tl_title AS title' ),
                array( 'page_id=tl_from' ) );
 }
@@ -83,8 +83,8 @@ function wfExportGetLinks( $inputPages, $pageSet, $table, $fields, $join ) {
        $dbr = wfGetDB( DB_SLAVE );
        foreach( $inputPages as $page ) {
                $title = Title::newFromText( $page );
-               $pageSet[$title->getPrefixedText()] = true;
                if( $title ) {
+                       $pageSet[$title->getPrefixedText()] = true;
                        /// @fixme May or may not be more efficient to batch these
                        ///        by namespace when given multiple input pages.
                        $result = $dbr->select(
@@ -104,6 +104,13 @@ function wfExportGetLinks( $inputPages, $pageSet, $table, $fields, $join ) {
        return $pageSet;
 }
 
+/**
+ * Callback function to remove empty strings from the pages array.
+ */
+function wfFilterPage( $page ) {
+       return $page !== '' && $page !== null;
+}
+
 /**
  *
  */
@@ -117,7 +124,7 @@ function wfSpecialExport( $page = '' ) {
        if ( $wgRequest->getCheck( 'addcat' ) ) {
                $page = $wgRequest->getText( 'pages' );
                $catname = $wgRequest->getText( 'catname' );
-               
+
                if ( $catname !== '' && $catname !== NULL && $catname !== false ) {
                        $t = Title::makeTitleSafe( NS_CATEGORY, $catname );
                        if ( $t ) {
@@ -161,7 +168,7 @@ function wfSpecialExport( $page = '' ) {
                                $history['dir'] = 'desc';
                        }
                }
-               
+
                if( $page != '' ) $doexport = true;
        } else {
                // Default to current-only for GET requests
@@ -172,7 +179,7 @@ function wfSpecialExport( $page = '' ) {
                } else {
                        $history = WikiExporter::CURRENT;
                }
-               
+
                if( $page != '' ) $doexport = true;
        }
 
@@ -180,13 +187,13 @@ function wfSpecialExport( $page = '' ) {
                // Override
                $history = WikiExporter::CURRENT;
        }
-       
+
        $list_authors = $wgRequest->getCheck( 'listauthors' );
        if ( !$curonly || !$wgExportAllowListContributors ) $list_authors = false ;
-       
+
        if ( $doexport ) {
                $wgOut->disable();
-               
+
                // Cancel output buffering and gzipping if set
                // This should provide safer streaming for pages with history
                wfResetOutputBuffers();
@@ -196,9 +203,9 @@ function wfSpecialExport( $page = '' ) {
                        $filename = urlencode( $wgSitename . '-' . wfTimestampNow() . '.xml' );
                        $wgRequest->response()->header( "Content-disposition: attachment;filename={$filename}" );
                }
-               
+
                /* Split up the input and look up linked pages */
-               $inputPages = array_filter( explode( "\n", $page ) );
+               $inputPages = array_filter( explode( "\n", $page ), 'wfFilterPage' );
                $pageSet = array_flip( $inputPages );
 
                if( $wgRequest->getCheck( 'templates' ) ) {
@@ -211,16 +218,16 @@ function wfSpecialExport( $page = '' ) {
                        $pageSet = wfExportGetImages( $inputPages, $pageSet );
                }
                */
-               
+
                $pages = array_keys( $pageSet );
-               
+
                /* Ok, let's get to it... */
 
                $db = wfGetDB( DB_SLAVE );
                $exporter = new WikiExporter( $db, $history );
                $exporter->list_authors = $list_authors ;
                $exporter->openStream();
-               
+
                foreach( $pages as $page ) {
                        /*
                        if( $wgExportMaxHistory && !$curonly ) {
@@ -242,25 +249,25 @@ function wfSpecialExport( $page = '' ) {
 
                        $exporter->pageByTitle( $title );
                }
-               
+
                $exporter->closeStream();
                return;
        }
 
        $self = SpecialPage::getTitleFor( 'Export' );
        $wgOut->addHtml( wfMsgExt( 'exporttext', 'parse' ) );
-       
+
        $form = Xml::openElement( 'form', array( 'method' => 'post',
                'action' => $self->getLocalUrl( 'action=submit' ) ) );
-       
+
        $form .= Xml::inputLabel( wfMsg( 'export-addcattext' )  , 'catname', 'catname', 40 ) . ' ';
        $form .= Xml::submitButton( wfMsg( 'export-addcat' ), array( 'name' => 'addcat' ) ) . '<br />';
-       
+
        $form .= Xml::openElement( 'textarea', array( 'name' => 'pages', 'cols' => 40, 'rows' => 10 ) );
        $form .= htmlspecialchars( $page );
        $form .= Xml::closeElement( 'textarea' );
        $form .= '<br />';
-       
+
        if( $wgExportAllowHistory ) {
                $form .= Xml::checkLabel( wfMsg( 'exportcuronly' ), 'curonly', 'curonly', true ) . '<br />';
        } else {
@@ -270,8 +277,8 @@ function wfSpecialExport( $page = '' ) {
        // Enable this when we can do something useful exporting/importing image information. :)
        //$form .= Xml::checkLabel( wfMsg( 'export-images' ), 'images', 'wpExportImages', false ) . '<br />';
        $form .= Xml::checkLabel( wfMsg( 'export-download' ), 'wpDownload', 'wpDownload', true ) . '<br />';
-       
+
        $form .= Xml::submitButton( wfMsg( 'export-submit' ) );
        $form .= Xml::closeElement( 'form' );
        $wgOut->addHtml( $form );
-}
\ No newline at end of file
+}