Change calls from Xml::namespaceSelector() to Html::namespaceSelector() since the...

diff --git a/includes/specials/SpecialDeletedContributions.php b/includes/specials/SpecialDeletedContributions.php
index 0fe631a..64455d4 100644 (file)
--- a/includes/specials/SpecialDeletedContributions.php
+++ b/includes/specials/SpecialDeletedContributions.php
@@ -492,8 +492,17 @@ class DeletedContributionsPage extends SpecialPage {
                                'size' => '20',
                                'required' => ''
                        ) + ( $options['target'] ? array() : array( 'autofocus' ) ) ) . ' '.
-                       Xml::label( $this->msg( 'namespace' )->text(), 'namespace' ) . ' ' .
-                       Xml::namespaceSelector( $options['namespace'], '' ) . ' ' .
+                       Html::namespaceSelector(
+                               array(
+                                       'selected' => $options['namespace'],
+                                       'all' => '',
+                                       'label' => $this->msg( 'namespace' )->text()
+                               ), array(
+                                       'name'  => 'namespace',
+                                       'id'    => 'namespace',
+                                       'class' => 'namespaceselector',
+                               )
+                       ) . ' ' .
                        Xml::submitButton( $this->msg( 'sp-contributions-submit' )->text() ) .
                        Xml::closeElement( 'fieldset' ) .
                        Xml::closeElement( 'form' );

diff --git a/includes/specials/SpecialExport.php b/includes/specials/SpecialExport.php
index 3951f06..360d2d2 100644 (file)
--- a/includes/specials/SpecialExport.php
+++ b/includes/specials/SpecialExport.php
@@ -185,7 +185,16 @@ class SpecialExport extends SpecialPage {
                $form .= Xml::submitButton( $this->msg( 'export-addcat' )->text(), array( 'name' => 'addcat' ) ) . '<br />';
 
                if ( $wgExportFromNamespaces ) {
-                       $form .= Xml::namespaceSelector( $nsindex, null, 'nsindex', $this->msg( 'export-addnstext' )->text() ) . '&#160;';
+                       $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 />';
                }
 

diff --git a/includes/specials/SpecialImport.php b/includes/specials/SpecialImport.php
index ed93920..2ea030e 100644 (file)
--- a/includes/specials/SpecialImport.php
+++ b/includes/specials/SpecialImport.php
@@ -279,7 +279,16 @@ class SpecialImport extends SpecialPage {
                                                Xml::label( $this->msg( 'import-interwiki-namespace' )->text(), 'namespace' ) .
                                        "</td>
                                        <td class='mw-input'>" .
-                                               Xml::namespaceSelector( $this->namespace, '' ) .
+                                               Html::namespaceSelector(
+                                                       array(
+                                                               'selected' => $this->namespace,
+                                                               'all' => '',
+                                                       ), array(
+                                                               'name'  => 'namespace',
+                                                               'id'    => 'namespace',
+                                                               'class' => 'namespaceselector',
+                                                       )
+                                               ) .
                                        "</td>
                                </tr>
                                <tr>

diff --git a/includes/specials/SpecialLinkSearch.php b/includes/specials/SpecialLinkSearch.php
index f28f37d..0628269 100644 (file)
--- a/includes/specials/SpecialLinkSearch.php
+++ b/includes/specials/SpecialLinkSearch.php
@@ -91,8 +91,17 @@ class LinkSearchPage extends QueryPage {
                        Xml::element( 'legend', array(), $this->msg( 'linksearch' )->text() ) .
                        Xml::inputLabel( $this->msg( 'linksearch-pat' )->text(), 'target', 'target', 50, $target ) . ' ';
                if ( !$wgMiserMode ) {
-                       $s .= Xml::label( $this->msg( 'linksearch-ns' )->text(), 'namespace' ) . ' ' .
-                               Xml::namespaceSelector( $namespace, '' );
+                       $s .= Html::namespaceSelector(
+                               array(
+                                       'selected' => $namespace,
+                                       'all' => '',
+                                       'label' => $this->msg( 'linksearch-ns' )->text()
+                               ), array(
+                                       'name'  => 'namespace',
+                                       'id'    => 'namespace',
+                                       'class' => 'namespaceselector',
+                               )
+                       );
                }
                $s .=   Xml::submitButton( $this->msg( 'linksearch-ok' )->text() ) .
                        '</fieldset>' .

diff --git a/includes/specials/SpecialNewpages.php b/includes/specials/SpecialNewpages.php
index 6256b08..3c31ca0 100644 (file)
--- a/includes/specials/SpecialNewpages.php
+++ b/includes/specials/SpecialNewpages.php
@@ -237,7 +237,16 @@ class SpecialNewpages extends IncludableSpecialPage {
                                        Xml::label( wfMsg( 'namespace' ), 'namespace' ) .
                                '</td>
                                <td class="mw-input">' .
-                                       Xml::namespaceSelector( $namespace, 'all' ) .
+                                       Html::namespaceSelector(
+                                               array(
+                                                       'selected' => $namespace,
+                                                       'all' => 'all',
+                                               ), array(
+                                                       'name'  => 'namespace',
+                                                       'id'    => 'namespace',
+                                                       'class' => 'namespaceselector',
+                                               )
+                                       ) .
                                '</td>
                        </tr>' . ( $tagFilter ? (
                        '<tr>

diff --git a/includes/specials/SpecialProtectedpages.php b/includes/specials/SpecialProtectedpages.php
index c358dee..57d6841 100644 (file)
--- a/includes/specials/SpecialProtectedpages.php
+++ b/includes/specials/SpecialProtectedpages.php
@@ -187,8 +187,19 @@ class SpecialProtectedpages extends SpecialPage {
         */
        protected function getNamespaceMenu( $namespace = null ) {
                return "<span style='white-space: nowrap'>" .
-                       Xml::label( wfMsg( 'namespace' ), 'namespace' ) . '&#160;'
-                       . Xml::namespaceSelector( $namespace, '' ) . "</span>";
+               Html::rawElement( 'span', array( 'style' => 'white-space:nowrap' ),
+                       Html::namespaceSelector(
+                               array(
+                                       'selected' => $namespace,
+                                       'all' => '',
+                                       'label' => $this->msg( 'namespace' )->text()
+                               ), array(
+                                       'name'  => 'namespace',
+                                       'id'    => 'namespace',
+                                       'class' => 'namespaceselector',
+                               )
+                       )
+               );
        }
 
        /**

diff --git a/includes/specials/SpecialProtectedtitles.php b/includes/specials/SpecialProtectedtitles.php
index f4232cc..ad5f3f3 100644 (file)
--- a/includes/specials/SpecialProtectedtitles.php
+++ b/includes/specials/SpecialProtectedtitles.php
@@ -138,9 +138,17 @@ class SpecialProtectedtitles extends SpecialPage {
         * @return string
         */
        function getNamespaceMenu( $namespace = null ) {
-               return Xml::label( wfMsg( 'namespace' ), 'namespace' )
-                       . ' '
-                       . Xml::namespaceSelector( $namespace, '' );
+               return Html::namespaceSelector(
+                       array(
+                               'selected' => $namespace,
+                               'all' => '',
+                               'label' => $this->msg( 'namespace' )->text()
+                       ), array(
+                               'name'  => 'namespace',
+                               'id'    => 'namespace',
+                               'class' => 'namespaceselector',
+                       )
+               );
        }
 
        /**

diff --git a/includes/specials/SpecialWatchlist.php b/includes/specials/SpecialWatchlist.php
index 9eb6bdf..62358da 100644 (file)
--- a/includes/specials/SpecialWatchlist.php
+++ b/includes/specials/SpecialWatchlist.php
@@ -328,8 +328,17 @@ class SpecialWatchlist extends SpecialPage {
                $form .= $lang->pipeList( $links );
                $form .= Xml::openElement( 'form', array( 'method' => 'post', 'action' => $this->getTitle()->getLocalUrl(), 'id' => 'mw-watchlist-form-namespaceselector' ) );
                $form .= '<hr /><p>';
-               $form .= Xml::label( $this->msg( 'namespace' )->text(), 'namespace' ) . '&#160;';
-               $form .= Xml::namespaceSelector( $nameSpace, '' ) . '&#160;';
+               $form .= Html::namespaceSelector(
+                       array(
+                               'selected' => $nameSpace,
+                               'all' => '',
+                               'label' => $this->msg( 'namespace' )->text()
+                       ), array(
+                               'name'  => 'namespace',
+                               'id'    => 'namespace',
+                               'class' => 'namespaceselector',
+                       )
+               ) . '&#160;';
                $form .= Xml::checkLabel( $this->msg( 'invert' )->text(), 'invert', 'nsinvert', $invert ) . '&#160;';
                $form .= Xml::submitButton( $this->msg( 'allpagessubmit' )->text() ) . '</p>';
                $form .= Html::hidden( 'days', $values['days'] );

diff --git a/includes/specials/SpecialWhatlinkshere.php b/includes/specials/SpecialWhatlinkshere.php
index 7d4768a..5d6a112 100644 (file)
--- a/includes/specials/SpecialWhatlinkshere.php
+++ b/includes/specials/SpecialWhatlinkshere.php
@@ -413,8 +413,17 @@ class SpecialWhatLinksHere extends SpecialPage {
                $f .= ' ';
 
                # Namespace selector
-               $f .= Xml::label( $this->msg( 'namespace' )->text(), 'namespace' ) . ' ' .
-                       Xml::namespaceSelector( $namespace, '' );
+               $f .= Html::namespaceSelector(
+                       array(
+                               'selected' => $namespace,
+                               'all' => '',
+                               'label' => $this->msg( 'namespace' )->text()
+                       ), array(
+                               'name'  => 'namespace',
+                               'id'    => 'namespace',
+                               'class' => 'namespaceselector',
+                       )
+               );
 
                $f .= ' ';