| Index: trunk/phase3/includes/SpecialIpblocklist.php |
| — | — | @@ -277,7 +277,7 @@ |
| 278 | 278 | if ( $block->mCreateAccount ) { |
| 279 | 279 | $properties[] = $msg['createaccountblock']; |
| 280 | 280 | } |
| 281 | | - if (!$block->mEnableAutoblock ) { |
| | 281 | + if (!$block->mEnableAutoblock && !$block->mAddress ) { |
| 282 | 282 | $properties[] = $msg['noautoblockblock']; |
| 283 | 283 | } |
| 284 | 284 | |
| Index: trunk/phase3/includes/Block.php |
| — | — | @@ -367,6 +367,11 @@ |
| 368 | 368 | $this->mAnonOnly = 0; |
| 369 | 369 | } |
| 370 | 370 | |
| | 371 | + # Unset ipb_enable_autoblock for IP blocks, makes no sense |
| | 372 | + if ( !$this->mUser ) { |
| | 373 | + $this->mEnableAutoblock = 0; |
| | 374 | + } |
| | 375 | + |
| 371 | 376 | # Don't collide with expired blocks |
| 372 | 377 | Block::purgeExpired(); |
| 373 | 378 | |
| Index: trunk/phase3/RELEASE-NOTES |
| — | — | @@ -132,6 +132,11 @@ |
| 133 | 133 | * (bug 7785) Postgres compatibility for timestamps in RC feeds |
| 134 | 134 | * (bug 7550) Normalize user parameter normally on Special:Log |
| 135 | 135 | * (bug 7294) Fix PATH search for diff3 on install |
| | 136 | +* Various fixes related to the blocking change re: autoblocks. On inserting |
| | 137 | + an IP block, the ipb_enable_autoblock field is now automagically blanked, |
| | 138 | + because it doesn't make any sense for an IP. Additionally, IP blocks |
| | 139 | + without the ipb_enable_autoblock option no longer show up as "autoblock |
| | 140 | + disabled" on Special:Ipblocklist. |
| 136 | 141 | |
| 137 | 142 | == Languages updated == |
| 138 | 143 | |