From f72515cfcf5700b05289e663847540446d569379 Mon Sep 17 00:00:00 2001 From: nischayn22 Date: Tue, 21 May 2013 13:27:23 +0530 Subject: [PATCH] Fieldset legends is broken. HTMLForm constructor didn't use messagePrefix if context is null. Bug: 48650 Change-Id: I26367bd597f873838c8cf45d75800661d37c0f95 --- includes/HTMLForm.php | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) 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. -- 2.20.1