From 86097376ccba6fa40b4a1c7e62f43c00eb5aaca9 Mon Sep 17 00:00:00 2001 From: Alexandre Emsenhuber Date: Sun, 5 Apr 2009 14:02:37 +0000 Subject: [PATCH] Don't display the "noautoblock" flag when blocking an IP address since this option is not displayed in the block form. Thanks to Elfix on the French Wikipedia for the report. --- RELEASE-NOTES | 2 ++ includes/specials/SpecialBlockip.php | 3 ++- 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/RELEASE-NOTES b/RELEASE-NOTES index 3c1aca0205..c132de23dc 100644 --- a/RELEASE-NOTES +++ b/RELEASE-NOTES @@ -324,6 +324,8 @@ it from source control: http://www.mediawiki.org/wiki/Download_from_SVN * Fixed a PHP notice when $wgEnableSerializedMessages was set to false * (bug 18316) Removed superfluous name="fulltext" from Special:Search * (bug 18331) MediaWiki:Undelete-revision can now have wikitext +* The "noautoblock" flag is no longer displayed in the block log when blocking + an IP address == API changes in 1.15 == * (bug 16858) Revamped list=deletedrevs to make listing deleted contributions diff --git a/includes/specials/SpecialBlockip.php b/includes/specials/SpecialBlockip.php index 1c2dc67d24..dd7cc3f81b 100644 --- a/includes/specials/SpecialBlockip.php +++ b/includes/specials/SpecialBlockip.php @@ -598,7 +598,8 @@ class IPBlockForm { $flags[] = 'anononly'; if( $this->BlockCreateAccount ) $flags[] = 'nocreate'; - if( !$this->BlockEnableAutoblock ) + if( !$this->BlockEnableAutoblock && !IP::isIPAddress( $this->BlockAddress ) ) + // Same as anononly, this is not displayed when blocking an IP address $flags[] = 'noautoblock'; if ( $this->BlockEmail ) $flags[] = 'noemail'; -- 2.20.1