[MediaWiki-commits] [Gerrit] Fieldset legends is broken. - change (mediawiki/core)

[jenkins-bot (Code Review)]

jenkins-bot has submitted this change and it was merged.

Change subject: Fieldset legends is broken.
..


Fieldset legends is broken.

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

Bug: 48650
Change-Id: I26367bd597f873838c8cf45d75800661d37c0f95
---
M includes/HTMLForm.php
1 file changed, 5 insertions(+), 5 deletions(-)

Approvals:
  IAlex: Looks good to me, approved
  jenkins-bot: Verified



diff --git a/includes/HTMLForm.php b/includes/HTMLForm.php
index 7adbfc8..2ff598d 100644
--- a/includes/HTMLForm.php
+++ b/includes/HTMLForm.php
@@ -200,12 +200,12 @@
$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.

-- 
To view, visit https://gerrit.wikimedia.org/r/64782
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: merged
Gerrit-Change-Id: I26367bd597f873838c8cf45d75800661d37c0f95
Gerrit-PatchSet: 2
Gerrit-Project: mediawiki/core
Gerrit-Branch: master
Gerrit-Owner: Nischayn22 nischay...@gmail.com
Gerrit-Reviewer: Anomie bjor...@wikimedia.org
Gerrit-Reviewer: Daniel Friesen dan...@nadir-seen-fire.com
Gerrit-Reviewer: Happy-melon happy.melon.w...@gmail.com
Gerrit-Reviewer: IAlex coderev...@emsenhuber.ch
Gerrit-Reviewer: Jeroen De Dauw jeroended...@gmail.com
Gerrit-Reviewer: Nischayn22 nischay...@gmail.com
Gerrit-Reviewer: Reedy re...@wikimedia.org
Gerrit-Reviewer: awjrichards aricha...@wikimedia.org
Gerrit-Reviewer: jenkins-bot

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

[MediaWiki-commits] [Gerrit] Fieldset legends is broken. - change (mediawiki/core)

[Nischayn22 (Code Review)]

Nischayn22 has uploaded a new change for review.

  https://gerrit.wikimedia.org/r/64782


Change subject: Fieldset legends is broken.
..

Fieldset legends is broken.

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

Bug: 48650
Change-Id: I26367bd597f873838c8cf45d75800661d37c0f95
---
M includes/HTMLForm.php
1 file changed, 5 insertions(+), 5 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/core 
refs/changes/82/64782/1

diff --git a/includes/HTMLForm.php b/includes/HTMLForm.php
index 7adbfc8..2ff598d 100644
--- a/includes/HTMLForm.php
+++ b/includes/HTMLForm.php
@@ -200,12 +200,12 @@
$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.

-- 
To view, visit https://gerrit.wikimedia.org/r/64782
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: I26367bd597f873838c8cf45d75800661d37c0f95
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/core
Gerrit-Branch: master
Gerrit-Owner: Nischayn22 nischay...@gmail.com

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits