Merge "jquery.accessKeyLabel: make modifier info public"

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

diff --git a/includes/specials/SpecialExport.php b/includes/specials/SpecialExport.php
index 39c4d77..3ce9c76 100644 (file)
--- a/includes/specials/SpecialExport.php
+++ b/includes/specials/SpecialExport.php
@@ -65,7 +65,10 @@ class SpecialExport extends SpecialPage {
                                         */
                                        $catpages = $this->getPagesFromCategory( $t );
                                        if ( $catpages ) {
-                                               $page .= "\n" . implode( "\n", $catpages );
+                                               if ( $page !== '' ) {
+                                                       $page .= "\n";
+                                               }
+                                               $page .= implode( "\n", $catpages );
                                        }
                                }
                        }
@@ -232,8 +235,8 @@ class SpecialExport extends SpecialPage {
                        'textarea' => array(
                                'class' => 'HTMLTextAreaField',
                                'name' => 'pages',
+                               'label-message' => 'export-manual',
                                'nodata' => true,
-                               'cols' => 40,
                                'rows' => 10,
                                'default' => $page,
                        ),
@@ -298,7 +301,7 @@ class SpecialExport extends SpecialPage {
                        );
                }
 
-               $htmlForm = HTMLForm::factory( 'div', $formDescriptor, $this->getContext() );
+               $htmlForm = HTMLForm::factory( 'ooui', $formDescriptor, $this->getContext() );
                $htmlForm->setSubmitTextMsg( 'export-submit' );
                $htmlForm->prepareForm()->displayForm( false );
                $this->addHelpLink( 'Help:Export' );
@@ -385,7 +388,7 @@ class SpecialExport extends SpecialPage {
                        $exporter->allPages();
                } else {
                        foreach ( $pages as $page ) {
-                               #Bug 8824: Only export pages the user can read
+                               # Bug 8824: Only export pages the user can read
                                $title = Title::newFromText( $page );
                                if ( is_null( $title ) ) {
                                        // @todo Perhaps output an <error> tag or something.