* Prettify

* Rather throw an extension than split unuseful fatal error

diff --git a/includes/SpecialCategories.php b/includes/SpecialCategories.php
index 45e1ae6..7191fe9 100644 (file)
--- a/includes/SpecialCategories.php
+++ b/includes/SpecialCategories.php
@@ -53,13 +53,11 @@ class CategoryPager extends AlphabeticPager {
        function formatRow($result) {
                global $wgLang;
                $title = Title::makeTitle( NS_CATEGORY, $result->cl_to );
-               return ( 
-                       '<li>' .
-                       $this->getSkin()->makeLinkObj( $title, $title->getText() )
-                       . ' ' .
+               return Xml::tags('li', null,
+                       $this->getSkin()->makeLinkObj( $title, $title->getText() ) . ' (' .
                        wfMsgExt( 'nmembers', array( 'parsemag', 'escape'),
-                               $wgLang->formatNum( $result->count ) )
-                       . "</li>\n" );
+                               $wgLang->formatNum( $result->count ) ) . ')'
+                       ) . "\n";
        }
 }
 

diff --git a/includes/SpecialMIMEsearch.php b/includes/SpecialMIMEsearch.php
index d50efc0..5ecfb35 100644 (file)
--- a/includes/SpecialMIMEsearch.php
+++ b/includes/SpecialMIMEsearch.php
@@ -87,33 +87,16 @@ function wfSpecialMIMEsearch( $par = null ) {
        $mime = isset( $par ) ? $par : $wgRequest->getText( 'mime' );
 
        $wgOut->addHTML(
-               wfElement( 'form',
+               Xml::openElement( 'form',
                        array(
                                'id' => 'specialmimesearch',
                                'method' => 'get',
                                'action' => $wgTitle->escapeLocalUrl()
-                       ),
-                       null
+                       )
                ) .
-                       wfOpenElement( 'label' ) .
-                               wfMsgHtml( 'mimetype' ) .
-                               wfElement( 'input', array(
-                                               'type' => 'text',
-                                               'size' => 20,
-                                               'name' => 'mime',
-                                               'value' => $mime
-                                       ),
-                                       ''
-                               ) .
-                               ' ' .
-                               wfElement( 'input', array(
-                                               'type' => 'submit',
-                                               'value' => wfMsg( 'ilsubmit' )
-                                       ),
-                                       ''
-                               ) .
-                       wfCloseElement( 'label' ) .
-               wfCloseElement( 'form' )
+                       Xml::inputLabel( wfMsg( 'mimetype' ), 'mime', 'mime', 20, $mime ) .
+                       Xml::submitButton( wfMsg( 'ilsubmit' ) ) .
+               Xml::closeElement( 'form' )
        );
 
        list( $major, $minor ) = wfSpecialMIMEsearchParse( $mime );

diff --git a/includes/SpecialMostcategories.php b/includes/SpecialMostcategories.php
index df2b9ad..9a06f41 100644 (file)
--- a/includes/SpecialMostcategories.php
+++ b/includes/SpecialMostcategories.php
@@ -38,6 +38,7 @@ class MostcategoriesPage extends QueryPage {
        function formatResult( $skin, $result ) {
                global $wgLang;
                $title = Title::makeTitleSafe( $result->namespace, $result->title );
+               if ( !$title instanceof Title ) { throw new MWException('Invalid title in database'); }
                $count = wfMsgExt( 'ncategories', array( 'parsemag', 'escape' ), $wgLang->formatNum( $result->value ) );
                $link = $skin->makeKnownLinkObj( $title, $title->getText() );
                return wfSpecialList( $link, $count );