| Index: trunk/phase3/includes/specials/SpecialBlockip.php |
| — | — | @@ -598,7 +598,8 @@ |
| 599 | 599 | $flags[] = 'anononly'; |
| 600 | 600 | if( $this->BlockCreateAccount ) |
| 601 | 601 | $flags[] = 'nocreate'; |
| 602 | | - if( !$this->BlockEnableAutoblock ) |
| | 602 | + if( !$this->BlockEnableAutoblock && !IP::isIPAddress( $this->BlockAddress ) ) |
| | 603 | + // Same as anononly, this is not displayed when blocking an IP address |
| 603 | 604 | $flags[] = 'noautoblock'; |
| 604 | 605 | if ( $this->BlockEmail ) |
| 605 | 606 | $flags[] = 'noemail'; |
| Index: trunk/phase3/RELEASE-NOTES |
| — | — | @@ -324,6 +324,8 @@ |
| 325 | 325 | * Fixed a PHP notice when $wgEnableSerializedMessages was set to false |
| 326 | 326 | * (bug 18316) Removed superfluous name="fulltext" from Special:Search |
| 327 | 327 | * (bug 18331) MediaWiki:Undelete-revision can now have wikitext |
| | 328 | +* The "noautoblock" flag is no longer displayed in the block log when blocking |
| | 329 | + an IP address |
| 328 | 330 | |
| 329 | 331 | == API changes in 1.15 == |
| 330 | 332 | * (bug 16858) Revamped list=deletedrevs to make listing deleted contributions |