From: nischayn22 <nischayn22@gmail.com>
Date: Tue, 21 May 2013 07:57:23 +0000 (+0530)
Subject: Fieldset legends is broken.
X-Git-Tag: 1.31.0-rc.0~19571
X-Git-Url: http://git.cyclocoop.org/%22%20.%20generer_url_ecrire%28%22suivi_revisions%22%2C%22id_auteur=%24connecte%22%29%20.%20%22?a=commitdiff_plain;h=f72515cfcf5700b05289e663847540446d569379;p=lhc%2Fweb%2Fwiklou.git

Fieldset legends is broken.

HTMLForm constructor didn't use messagePrefix if context is null.

Bug: 48650
Change-Id: I26367bd597f873838c8cf45d75800661d37c0f95
---

diff --git a/includes/HTMLForm.php b/includes/HTMLForm.php
index 7adbfc8947..2ff598d834 100644
--- a/includes/HTMLForm.php
+++ b/includes/HTMLForm.php
@@ -200,12 +200,12 @@ class HTMLForm extends ContextSource {
 			$this->setContext( $context );
 			$this->mTitle = false; // We don't need them to set a title
 			$this->mMessagePrefix = $messagePrefix;
-		} else {
+		} elseif ( is_null( $context ) && $messagePrefix !== '' ) {
+			$this->mMessagePrefix = $messagePrefix;
+		} elseif ( is_string( $context ) && $messagePrefix === '' ) {
 			// B/C since 1.18
-			if ( is_string( $context ) && $messagePrefix === '' ) {
-				// it's actually $messagePrefix
-				$this->mMessagePrefix = $context;
-			}
+			// it's actually $messagePrefix
+			$this->mMessagePrefix = $context;
 		}
 
 		// Expand out into a tree.