X-Git-Url: https://git.heureux-cyclage.org/?a=blobdiff_plain;f=includes%2FSpecialMIMEsearch.php;h=5ecfb35fcbc9397b44b106f7bff7d0e1ef42c9b3;hb=b6a7be0ac6afc7d8af689778d09c9e722a5b550e;hp=cbbe6f936d14a1d34a9a32ea26945681c5eee81b;hpb=36ed0cd96c478292bacb9a01be47a15cd2e50301;p=lhc%2Fweb%2Fwiklou.git

diff --git a/includes/SpecialMIMEsearch.php b/includes/SpecialMIMEsearch.php
index cbbe6f936d..5ecfb35fcb 100644
--- a/includes/SpecialMIMEsearch.php
+++ b/includes/SpecialMIMEsearch.php
@@ -3,16 +3,16 @@
  * A special page to search for files by MIME type as defined in the
  * img_major_mime and img_minor_mime fields in the image table
  *
- * @package MediaWiki
- * @subpackage SpecialPage
+ * @addtogroup SpecialPage
  *
  * @author Ævar Arnfjörð Bjarmason <avarab@gmail.com>
  * @license http://www.gnu.org/copyleft/gpl.html GNU General Public License 2.0 or later
  */
 
 /**
- * @package MediaWiki
- * @subpackage SpecialPage
+ * Searches the database for files of the requested MIME type, comparing this with the
+ * 'img_major_mime' and 'img_minor_mime' fields in the image table.
+ * @addtogroup SpecialPage
  */
 class MIMEsearchPage extends QueryPage {
 	var $major, $minor;
@@ -38,7 +38,7 @@ class MIMEsearchPage extends QueryPage {
 	}
 
 	function getSQL() {
-		$dbr =& wfGetDB( DB_SLAVE );
+		$dbr = wfGetDB( DB_SLAVE );
 		$image = $dbr->tableName( 'image' );
 		$major = $dbr->addQuotes( $this->major );
 		$minor = $dbr->addQuotes( $this->minor );
@@ -69,7 +69,7 @@ class MIMEsearchPage extends QueryPage {
 		$download = $skin->makeMediaLink( $nt->getText(), 'fuck me!', wfMsgHtml( 'download' ) );
 		$bytes = wfMsgExt( 'nbytes', array( 'parsemag', 'escape'),
 			$wgLang->formatNum( $result->img_size ) );
-		$dimensions = wfMsg( 'widthheight', $wgLang->formatNum( $result->img_width ),
+		$dimensions = wfMsgHtml( 'widthheight', $wgLang->formatNum( $result->img_width ),
 			$wgLang->formatNum( $result->img_height ) );
 		$user = $skin->makeLinkObj( Title::makeTitle( NS_USER, $result->img_user_text ), $result->img_user_text );
 		$time = $wgLang->timeanddate( $result->img_timestamp );
@@ -79,7 +79,7 @@ class MIMEsearchPage extends QueryPage {
 }
 
 /**
- * constructor
+ * Output the HTML search form, and constructs the MIMEsearchPage object.
  */
 function wfSpecialMIMEsearch( $par = null ) {
 	global $wgRequest, $wgTitle, $wgOut;
@@ -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 );
@@ -126,9 +109,12 @@ function wfSpecialMIMEsearch( $par = null ) {
 }
 
 function wfSpecialMIMEsearchParse( $str ) {
-	wfSuppressWarnings();
+	// searched for an invalid MIME type.
+	if( strpos( $str, '/' ) === false) {
+		return array ('', '');
+	}
+	
 	list( $major, $minor ) = explode( '/', $str, 2 );
-	wfRestoreWarnings();
 
 	return array(
 		ltrim( $major, ' ' ),