From 4a7b1a1282f01a51fc878f253bbd33b78a79e87a Mon Sep 17 00:00:00 2001
From: Brion Vibber <brion@users.mediawiki.org>
Date: Wed, 30 Jul 2008 19:55:11 +0000
Subject: [PATCH] Revert r38229: 	"* Add a nice fieldset for consistency
 	* Switch result line and input form 	* Do not show result line
 "Below is a list of 0 files...". We have the message 'noimages' instead."

Fieldset label duplicates inputbox label, which looks kind of odd to me.
Moving lines around when set is empty changes the click hotspot for "Show new images since..." link, which is pretty annoying when following new uploads
---
 includes/specials/SpecialNewimages.php | 28 ++++++++++++--------------
 languages/messages/MessagesDe.php      |  4 +---
 languages/messages/MessagesEn.php      |  2 --
 maintenance/language/messages.inc      |  2 --
 4 files changed, 14 insertions(+), 22 deletions(-)

diff --git a/includes/specials/SpecialNewimages.php b/includes/specials/SpecialNewimages.php
index b7a52802c6..e57f6fc1eb 100644
--- a/includes/specials/SpecialNewimages.php
+++ b/includes/specials/SpecialNewimages.php
@@ -147,26 +147,24 @@ function wfSpecialNewimages( $par, $specialPage ) {
 		$lastTimestamp = $timestamp;
 	}
 
-	$titleObj = SpecialPage::getTitleFor( 'Newimages' );
-	$action = $titleObj->getLocalURL( $hidebots ? '' : 'hidebots=0' );
-	if ( $shownav && !$wgMiserMode ) {
-		$wgOut->addHTML(
-			Xml::openElement( 'form', array( 'action' => $action, 'id' => 'imagesearch' ) ) .
-			Xml::fieldset( wfMsg( 'newimages-legend' ) ) .
-			Xml::inputLabel( wfMsg( 'newimages-label' ), 'wpIlMatch', 'wpIlMatch', 20, $wpIlMatch ) . ' ' .
-			Xml::submitButton( wfMsg( 'ilsubmit' ), array( 'name' => 'wpIlSubmit' ) ) .
-			Xml::closeElement( 'fieldset' ) .
-			Xml::closeElement( 'form' )
-		 );
-	}
-
 	$bydate = wfMsg( 'bydate' );
 	$lt = $wgLang->formatNum( min( $shownImages, $limit ) );
-	if ( $shownav && count( $images ) ) {
-		$text = wfMsgExt( 'imagelisttext', array( 'parse' ), $lt, $bydate );
+	if ($shownav) {
+		$text = wfMsgExt( 'imagelisttext', array('parse'), $lt, $bydate );
 		$wgOut->addHTML( $text . "\n" );
 	}
 
+	$sub = wfMsg( 'ilsubmit' );
+	$titleObj = SpecialPage::getTitleFor( 'Newimages' );
+	$action = $titleObj->escapeLocalURL( $hidebots ? '' : 'hidebots=0' );
+	if ($shownav && !$wgMiserMode) {
+		$wgOut->addHTML( "<form id=\"imagesearch\" method=\"post\" action=\"" .
+		  "{$action}\">" .
+			Xml::input( 'wpIlMatch', 20, $wpIlMatch ) . ' ' .
+		  Xml::submitButton( $sub, array( 'name' => 'wpIlSubmit' ) ) .
+		  "</form>" );
+	}
+
 	/**
 	 * Paging controls...
 	 */
diff --git a/languages/messages/MessagesDe.php b/languages/messages/MessagesDe.php
index 90e6b601a0..6b07118dc5 100644
--- a/languages/messages/MessagesDe.php
+++ b/languages/messages/MessagesDe.php
@@ -2220,10 +2220,8 @@ $1',
 
 # Special:Newimages
 'newimages'             => 'Neue Dateien',
-'imagelisttext'         => "Hier ist eine Liste mit '''$1''' {{PLURAL:$1|Datei|Dateien}}, sortiert $2.",
+'imagelisttext'         => "Hier ist eine Liste von '''$1''' {{PLURAL:$1|Datei|Dateien}}, sortiert $2.",
 'newimages-summary'     => 'Diese Spezialseite zeigt die zuletzt hochgeladenen Dateien an.',
-'newimages-legend'      => 'Dateiname',
-'newimages-label'       => 'Dateiname (oder ein Teil davon):',
 'showhidebots'          => '(Bots $1)',
 'noimages'              => 'Keine Dateien gefunden.',
 'ilsubmit'              => 'Suchen',
diff --git a/languages/messages/MessagesEn.php b/languages/messages/MessagesEn.php
index 6fe4498a24..7f7534a35f 100644
--- a/languages/messages/MessagesEn.php
+++ b/languages/messages/MessagesEn.php
@@ -2822,8 +2822,6 @@ $1',
 'newimages'             => 'Gallery of new files',
 'imagelisttext'         => "Below is a list of '''$1''' {{PLURAL:$1|file|files}} sorted $2.",
 'newimages-summary'     => 'This special page shows the last uploaded files.',
-'newimages-legend'      => 'Filename',
-'newimages-label'       => 'Filename (or a part of it):',
 'showhidebots'          => '($1 bots)',
 'noimages'              => 'Nothing to see.',
 'ilsubmit'              => 'Search',
diff --git a/maintenance/language/messages.inc b/maintenance/language/messages.inc
index 18649c2ad3..82f69a4346 100644
--- a/maintenance/language/messages.inc
+++ b/maintenance/language/messages.inc
@@ -1991,8 +1991,6 @@ $wgMessageStructure = array(
 		'newimages',
 		'imagelisttext',
 		'newimages-summary',
-		'newimages-legend',
-		'newimages-label',
 		'showhidebots',
 		'noimages',
 		'ilsubmit',
-- 
2.20.1