From 1a9e871a70ba910c387813dc49570c012f767c7b Mon Sep 17 00:00:00 2001
From: Rob Church <robchurch@users.mediawiki.org>
Date: Thu, 22 Jun 2006 01:40:51 +0000
Subject: [PATCH] (bug 6392) Fix misbehaving <br /> in preferences form

---
 RELEASE-NOTES                   |  1 +
 includes/SpecialPreferences.php | 14 ++++++++------
 2 files changed, 9 insertions(+), 6 deletions(-)

diff --git a/RELEASE-NOTES b/RELEASE-NOTES
index 90a182b5a1..1e926efe0b 100644
--- a/RELEASE-NOTES
+++ b/RELEASE-NOTES
@@ -534,6 +534,7 @@ Some default configuration options have changed:
 * Remove unused "validation" table definitions from the schema files
 * (bug 6398) Work around apparent PCRE bug breaking section editing when
   massively-indented preformatted text immediately followed a header
+* (bug 6392) Fix misbehaving <br /> in preferences form
 
 
 == Compatibility ==
diff --git a/includes/SpecialPreferences.php b/includes/SpecialPreferences.php
index 1ade3079c5..b4a566935e 100644
--- a/includes/SpecialPreferences.php
+++ b/includes/SpecialPreferences.php
@@ -691,12 +691,14 @@ class PreferencesForm {
 		}
 		# </FIXME>
 
-		if ($wgAllowRealName || $wgEnableEmail) {
-			$wgOut->addHTML("<div class='prefsectiontip'>");
-			$rn = $wgAllowRealName ? wfMsg('prefs-help-realname') : '';
-			$em = $wgEnableEmail ? '<br />' .  wfMsg('prefs-help-email') : '';
-			$wgOut->addHTML( $rn . $em  . '</div>');
-		}
+		# Show little "help" tips for the real name and email address options
+		if( $wgAllowRealName || $wgEnableEmail ) {
+			if( $wgAllowRealName )
+				$tips[] = wfMsg( 'prefs-help-realname' );
+			if( $wgEnableEmail )
+				$tips[] = wfMsg( 'prefs-help-email' );
+			$wgOut->addHtml( '<div class="prefsectiontip">' . implode( '<br />', $tips ) . '</div>' );
+		}		
 
 		$wgOut->addHTML( '</fieldset>' );
 
-- 
2.20.1