merging latest master

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

diff --git a/includes/specials/SpecialExport.php b/includes/specials/SpecialExport.php
index d061389..b4294b3 100644 (file)
--- a/includes/specials/SpecialExport.php
+++ b/includes/specials/SpecialExport.php
@@ -93,6 +93,13 @@ class SpecialExport extends SpecialPage {
                elseif( $request->getCheck( 'exportall' ) && $wgExportAllowAll ) {
                        $this->doExport = true;
                        $exportall = true;
+
+                       /* Although $page and $history are not used later on, we
+                       nevertheless set them to avoid that PHP notices about using
+                       undefined variables foul up our XML output (see call to
+                       doExport(...) further down) */
+                       $page = '';
+                       $history = '';
                }
                elseif( $request->wasPosted() && $par == '' ) {
                        $page = $request->getText( 'pages' );
@@ -181,17 +188,26 @@ class SpecialExport extends SpecialPage {
 
                $form = Xml::openElement( 'form', array( 'method' => 'post',
                        'action' => $this->getTitle()->getLocalUrl( 'action=submit' ) ) );
-               $form .= Xml::inputLabel( wfMsg( 'export-addcattext' )    , 'catname', 'catname', 40 ) . ' ';
-               $form .= Xml::submitButton( wfMsg( 'export-addcat' ), array( 'name' => 'addcat' ) ) . '<br />';
+               $form .= Xml::inputLabel( $this->msg( 'export-addcattext' )->text(), 'catname', 'catname', 40 ) . '&#160;';
+               $form .= Xml::submitButton( $this->msg( 'export-addcat' )->text(), array( 'name' => 'addcat' ) ) . '<br />';
 
                if ( $wgExportFromNamespaces ) {
-                       $form .= Xml::namespaceSelector( $nsindex, null, 'nsindex', wfMsg( 'export-addnstext' ) ) . '&#160;';
-                       $form .= Xml::submitButton( wfMsg( 'export-addns' ), array( 'name' => 'addns' ) ) . '<br />';
+                       $form .= Html::namespaceSelector(
+                               array(
+                                       'selected' => $nsindex,
+                                       'label' => $this->msg( 'export-addnstext' )->text()
+                               ), array(
+                                       'name'  => 'nsindex',
+                                       'id'    => 'namespace',
+                                       'class' => 'namespaceselector',
+                               )
+                       ) . '&#160;';
+                       $form .= Xml::submitButton( $this->msg( 'export-addns' )->text(), array( 'name' => 'addns' ) ) . '<br />';
                }
 
                if ( $wgExportAllowAll ) {
                        $form .= Xml::checkLabel(
-                               wfMsg( 'exportall' ),
+                               $this->msg( 'exportall' )->text(),
                                'exportall',
                                'exportall',
                                $request->wasPosted() ? $request->getCheck( 'exportall' ) : false
@@ -203,29 +219,29 @@ class SpecialExport extends SpecialPage {
 
                if( $wgExportAllowHistory ) {
                        $form .= Xml::checkLabel(
-                               wfMsg( 'exportcuronly' ),
+                               $this->msg( 'exportcuronly' )->text(),
                                'curonly',
                                'curonly',
                                $request->wasPosted() ? $request->getCheck( 'curonly' ) : true
                        ) . '<br />';
                } else {
-                       $out->addHTML( wfMsgExt( 'exportnohistory', 'parse' ) );
+                       $out->addWikiMsg( 'exportnohistory' );
                }
 
                $form .= Xml::checkLabel(
-                       wfMsg( 'export-templates' ),
+                       $this->msg( 'export-templates' )->text(),
                        'templates',
                        'wpExportTemplates',
                        $request->wasPosted() ? $request->getCheck( 'templates' ) : false
                ) . '<br />';
 
                if( $wgExportMaxLinkDepth || $this->userCanOverrideExportDepth() ) {
-                       $form .= Xml::inputLabel( wfMsg( 'export-pagelinks' ), 'pagelink-depth', 'pagelink-depth', 20, 0 ) . '<br />';
+                       $form .= Xml::inputLabel( $this->msg( 'export-pagelinks' )->text(), 'pagelink-depth', 'pagelink-depth', 20, 0 ) . '<br />';
                }
                // 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( $this->msg( 'export-images' )->text(), 'images', 'wpExportImages', false ) . '<br />';
                $form .= Xml::checkLabel(
-                       wfMsg( 'export-download' ),
+                       $this->msg( 'export-download' )->text(),
                        'wpDownload',
                        'wpDownload',
                        $request->wasPosted() ? $request->getCheck( 'wpDownload' ) : true
@@ -233,14 +249,14 @@ class SpecialExport extends SpecialPage {
 
                if ( $wgExportAllowListContributors ) {
                        $form .= Xml::checkLabel(
-                               wfMsg( 'exportlistauthors' ),
+                               $this->msg( 'exportlistauthors' )->text(),
                                'listauthors',
                                'listauthors',
                                $request->wasPosted() ? $request->getCheck( 'listauthors' ) : false
                        ) . '<br />';
                }
 
-               $form .= Xml::submitButton( wfMsg( 'export-submit' ), Linker::tooltipAndAccesskeyAttribs( 'export' ) );
+               $form .= Xml::submitButton( $this->msg( 'export-submit' )->text(), Linker::tooltipAndAccesskeyAttribs( 'export' ) );
                $form .= Xml::closeElement( 'form' );
 
                $out->addHTML( $form );
@@ -439,7 +455,7 @@ class SpecialExport extends SpecialPage {
        private function getTemplates( $inputPages, $pageSet ) {
                return $this->getLinks( $inputPages, $pageSet,
                        'templatelinks',
-                       array( 'tl_namespace AS namespace', 'tl_title AS title' ),
+                       array( 'namespace' => 'tl_namespace', 'title' => 'tl_title' ),
                        array( 'page_id=tl_from' )
                );
        }
@@ -481,7 +497,7 @@ class SpecialExport extends SpecialPage {
                for( ; $depth > 0; --$depth ) {
                        $pageSet = $this->getLinks(
                                $inputPages, $pageSet, 'pagelinks',
-                               array( 'pl_namespace AS namespace', 'pl_title AS title' ),
+                               array( 'namespace' => 'pl_namespace', 'title' => 'pl_title' ),
                                array( 'page_id=pl_from' )
                        );
                        $inputPages = array_keys( $pageSet );
@@ -503,13 +519,14 @@ class SpecialExport extends SpecialPage {
                        $inputPages,
                        $pageSet,
                        'imagelinks',
-                       array( NS_FILE . ' AS namespace', 'il_to AS title' ),
+                       array( 'namespace' => NS_FILE, 'title' => 'il_to' ),
                        array( 'page_id=il_from' )
                );
        }
 
        /**
         * Expand a list of pages to include items used in those pages.
+        * @return array
         */
        private function getLinks( $inputPages, $pageSet, $table, $fields, $join ) {
                $dbr = wfGetDB( DB_SLAVE );