| Index: trunk/phase3/skins/common/block.js |
| — | — | @@ -42,11 +42,6 @@ |
| 43 | 43 | if( autoblockRow ) { |
| 44 | 44 | autoblockRow.style.display = isIp && !isEmpty ? 'none' : ''; |
| 45 | 45 | } |
| 46 | | - |
| 47 | | - var emailblockRow = document.getElementById('wpEnableEmailBan'); |
| 48 | | - if( emailblockRow ) { |
| 49 | | - emailblockRow.style.display = isIp && !isEmpty ? 'none' : ''; |
| 50 | | - } |
| 51 | 46 | |
| 52 | 47 | var hideuserRow = document.getElementById('wpEnableHideUser'); |
| 53 | 48 | if( hideuserRow ) { |
| Index: trunk/phase3/includes/Block.php |
| — | — | @@ -453,9 +453,12 @@ |
| 454 | 454 | # Unset ipb_enable_autoblock for IP blocks, makes no sense |
| 455 | 455 | if ( !$this->mUser ) { |
| 456 | 456 | $this->mEnableAutoblock = 0; |
| 457 | | - $this->mBlockEmail = 0; //Same goes for email... |
| | 457 | + |
| 458 | 458 | } |
| 459 | | - |
| | 459 | + # bug 18860: non-anon-only IP blocks should be allowed to block email |
| | 460 | + if ( !$this->mUser && $this->mAnonOnly ) { |
| | 461 | + $this->mBlockEmail = 0; |
| | 462 | + } |
| 460 | 463 | if( !$this->mByName ) { |
| 461 | 464 | if( $this->mBy ) { |
| 462 | 465 | $this->mByName = User::whoIs( $this->mBy ); |
| Index: trunk/phase3/RELEASE-NOTES |
| — | — | @@ -66,6 +66,7 @@ |
| 67 | 67 | * (bug 5755) Introduce {{CURRENTMONTH1}} and {{LOCALMONTH1}} to display the |
| 68 | 68 | month number without the leading zero |
| 69 | 69 | * (bug 13456) categoriespagetext supports PLURAL |
| | 70 | +* (bug 18860) Blocks of IPs affecting registered users can now block email |
| 70 | 71 | |
| 71 | 72 | === Bug fixes in 1.16 === |
| 72 | 73 | |