From 25f9a38bfeb953ea4dd6968f8a633b8fa3edaba6 Mon Sep 17 00:00:00 2001
From: Alexandre Emsenhuber <ialex@users.mediawiki.org>
Date: Sat, 17 Oct 2009 08:29:15 +0000
Subject: [PATCH] * (bug 21079) There is no more line wrapping between label
 and field in Special:Log

---
 RELEASE-NOTES              | 1 +
 includes/LogEventsList.php | 8 ++++++--
 2 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/RELEASE-NOTES b/RELEASE-NOTES
index 3f78ef09ca..9b0713c988 100644
--- a/RELEASE-NOTES
+++ b/RELEASE-NOTES
@@ -561,6 +561,7 @@ it from source control: http://www.mediawiki.org/wiki/Download_from_SVN
 * (bug 21114) Special:Contributions no longer shows diff links for new revisions
 * (bug 21116) MediaWiki:Templatesused, MediaWiki:Templatesusedpreview and
   MediaWiki:Templatesusedsection now support plural
+* (bug 21079) There is no more line wrapping between label and field in Special:Log
 
 == API changes in 1.16 ==
 
diff --git a/includes/LogEventsList.php b/includes/LogEventsList.php
index 83c3eb726c..fce4e9cc31 100644
--- a/includes/LogEventsList.php
+++ b/includes/LogEventsList.php
@@ -220,7 +220,9 @@ class LogEventsList {
 	 * @return String: Formatted HTML
 	 */
 	private function getUserInput( $user ) {
-		return Xml::inputLabel( wfMsg( 'specialloguserlabel' ), 'user', 'mw-log-user', 15, $user );
+		return '<span style="white-space: nowrap">' .
+			Xml::inputLabel( wfMsg( 'specialloguserlabel' ), 'user', 'mw-log-user', 15, $user ) .
+			'</span>';
 	}
 
 	/**
@@ -228,7 +230,9 @@ class LogEventsList {
 	 * @return String: Formatted HTML
 	 */
 	private function getTitleInput( $title ) {
-		return Xml::inputLabel( wfMsg( 'speciallogtitlelabel' ), 'page', 'mw-log-page', 20, $title );
+		return '<span style="white-space: nowrap">' .
+			Xml::inputLabel( wfMsg( 'speciallogtitlelabel' ), 'page', 'mw-log-page', 20, $title ) .
+			'</span>';
 	}
 
 	/**
-- 
2.20.1