From: umherirrender <umherirrender_de.wp@web.de>
Date: Sat, 21 Apr 2012 09:55:40 +0000 (+0200)
Subject: (bug 31757) Add a word-separator between help-messages in HTMLForm
X-Git-Tag: 1.31.0-rc.0~23858
X-Git-Url: http://git.cyclocoop.org/%24href?a=commitdiff_plain;h=e51629e5de4ba32f4c230a8f009fa13cd0b7124c;p=lhc%2Fweb%2Fwiklou.git

(bug 31757) Add a word-separator between help-messages in HTMLForm

Change-Id: Ie4dbfb16e195dabd6abf0634b21c7867ed584920
---

diff --git a/RELEASE-NOTES-1.20 b/RELEASE-NOTES-1.20
index 9722f48f30..ebf30ca198 100644
--- a/RELEASE-NOTES-1.20
+++ b/RELEASE-NOTES-1.20
@@ -87,6 +87,7 @@ production.
 * (bug 18704) Add a unique CSS class or ID to the tagfilter table row at RecentChanges
 * (bug 33564) transwiki import sometimes result in invalid title.
 * (bug 35572) Blocks appear to succeed even if query fails due to wrong DB structure
+* (bug 31757) Add a word-separator between help-messages in HTMLForm
 
 === API changes in 1.20 ===
 * (bug 34316) Add ability to retrieve maximum upload size from MediaWiki API.
diff --git a/includes/HTMLForm.php b/includes/HTMLForm.php
index 505a26f4fd..029ed05000 100644
--- a/includes/HTMLForm.php
+++ b/includes/HTMLForm.php
@@ -1096,6 +1096,11 @@ abstract class HTMLFormField {
 				$msg = wfMessage( array_shift( $helpMessage ), $helpMessage );
 
 				if( $msg->exists() ) {
+					if( is_null( $helptext ) ) {
+						$helptext = '';
+					} else {
+						$helptext .= wfMessage( 'word-separator' )->escaped(); // some space
+					}
 					$helptext .= $msg->parse(); // Append message
 				}
 			}