(bug 13718) Return the proper continue parameter for cmsort=timestamp

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

diff --git a/includes/SpecialImport.php b/includes/SpecialImport.php
index ef07c78..5557b0a 100644 (file)
--- a/includes/SpecialImport.php
+++ b/includes/SpecialImport.php
@@ -104,7 +104,7 @@ function wfSpecialImport( $page = '' ) {
                        Xml::openElement( 'form', array( 'enctype' => 'multipart/form-data', 'method' => 'post', 'action' => $action ) ) .
                        Xml::hidden( 'action', 'submit' ) .
                        Xml::hidden( 'source', 'upload' ) .
-                       "<input type='file' name='xmlimport' value='' size='30' />" . // No Xml function for type=file? Todo?
+                       Xml::input( 'xmlimport', 50, '', array( 'type' => 'file' ) ) . ' ' .
                        Xml::submitButton( wfMsg( 'uploadbtn' ) ) . 
                        Xml::closeElement( 'form' ) .
                        Xml::closeElement( 'fieldset' )
@@ -123,15 +123,14 @@ function wfSpecialImport( $page = '' ) {
                        wfMsgExt( 'import-interwiki-text', array( 'parse' ) ) .
                        Xml::hidden( 'action', 'submit' ) .
                        Xml::hidden( 'source', 'interwiki' ) .
-                       Xml::openElement( 'table' ) .
+                       Xml::openElement( 'table', array( 'id' => 'mw-import-table' ) ) .
                        "<tr>
                                <td>" .
                                        Xml::openElement( 'select', array( 'name' => 'interwiki' ) )
                );
                foreach( $wgImportSources as $prefix ) {
-                       $iw = htmlspecialchars( $prefix );
-                       $selected = ($interwiki === $prefix) ? ' selected="selected"' : '';
-                       $wgOut->addHTML( Xml::option( $iw, $iw, $selected ) );
+                       $selected = ( $interwiki === $prefix ) ? ' selected="selected"' : '';
+                       $wgOut->addHTML( Xml::option( $prefix, $prefix, $selected ) );
                }
                $wgOut->addHTML(
                                        Xml::closeElement( 'select' ) .
@@ -359,7 +358,7 @@ class WikiRevision {
                }
 
                // avoid memory leak...?
-               $linkCache =& LinkCache::singleton();
+               $linkCache = LinkCache::singleton();
                $linkCache->clear();
 
                $article = new Article( $this->title );