jenkins-bot has submitted this change and it was merged.
Change subject: Fix hiding of other expiry input row
......................................................................
Fix hiding of other expiry input row
This was only hiding the input box, not the full row.
Bug: 18412
Change-Id: I901d31a4a7b2effcef8fabd3d56e112b40ed17e4
---
M GlobalBlocking.i18n.php
M SpecialGlobalBlock.php
2 files changed, 4 insertions(+), 5 deletions(-)
Approvals:
Legoktm: Looks good to me, approved
Siebrand: Looks good to me, but someone else must approve
jenkins-bot: Verified
diff --git a/GlobalBlocking.i18n.php b/GlobalBlocking.i18n.php
index efc1212..dcf8a7f 100644
--- a/GlobalBlocking.i18n.php
+++ b/GlobalBlocking.i18n.php
@@ -27,7 +27,7 @@
'globalblocking-block-edit-dropdown' => 'Edit block reasons',
'globalblocking-block-expiry' => 'Expiry:',
'globalblocking-block-expiry-other' => 'Other expiry time',
- 'globalblocking-block-expiry-otherfield' => 'Other time:',
+ 'globalblocking-block-expiry-selector-other' => 'Other time:',
'globalblocking-block-legend' => 'Block an IP address globally',
'globalblocking-block-options' => 'Options:',
'globalblocking-ipaddress' => 'IP address:',
diff --git a/SpecialGlobalBlock.php b/SpecialGlobalBlock.php
index 245f52f..2d79194 100644
--- a/SpecialGlobalBlock.php
+++ b/SpecialGlobalBlock.php
@@ -219,16 +219,15 @@
} else {
$fields['globalblocking-block-expiry'] =
$this->buildExpirySelector(
'wpExpiry',
- 'mw-globalblock-expiry-selector',
+ 'mw-globalblocking-block-expiry-selector',
$this->mExpirySelection,
$dropdown->inContentLanguage()->plain()
);
- $fields['globalblocking-block-expiry-otherfield'] =
+ $fields['globalblocking-block-expiry-selector-other'] =
Xml::input(
'wpExpiryOther',
45,
- $this->mExpiry ==
$this->mExpirySelection ? '' : $this->mExpiry,
- array( 'id' =>
'mw-globalblock-expiry-selector-other' )
+ $this->mExpiry ==
$this->mExpirySelection ? '' : $this->mExpiry
);
}
--
To view, visit https://gerrit.wikimedia.org/r/59760
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I901d31a4a7b2effcef8fabd3d56e112b40ed17e4
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/GlobalBlocking
Gerrit-Branch: master
Gerrit-Owner: Alex Monk <[email protected]>
Gerrit-Reviewer: CSteipp <[email protected]>
Gerrit-Reviewer: Jforrester <[email protected]>
Gerrit-Reviewer: Legoktm <[email protected]>
Gerrit-Reviewer: Pgehres <[email protected]>
Gerrit-Reviewer: Raimond Spekking <[email protected]>
Gerrit-Reviewer: Siebrand <[email protected]>
Gerrit-Reviewer: jenkins-bot
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
