Index: MediaWiki/branches/1.11/includes/SpecialMIMEsearch.php
===================================================================
--- MediaWiki/branches/1.11/includes/SpecialMIMEsearch.php	(revision 1280)
+++ MediaWiki/branches/1.11/includes/SpecialMIMEsearch.php	(revision 1281)
@@ -67,5 +67,5 @@
 		$plink = $skin->makeLink( $nt->getPrefixedText(), $text );
 
-		$download = $skin->makeMediaLink( $nt->getText(), 'fuck me!', wfMsgHtml( 'download' ) );
+		$download = $skin->makeMediaLinkObj( $nt, wfMsgHtml( 'download' ) );
 		$bytes = wfMsgExt( 'nbytes', array( 'parsemag', 'escape'),
 			$wgLang->formatNum( $result->img_size ) );
@@ -88,31 +88,14 @@
 
 	$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' )
 	);
 
@@ -156,3 +139,3 @@
 	return in_array( $type, $types );
 }
-?>
+