| Index: branches/wmf/1.18wmf1/includes/specials/SpecialBlock.php |
| — | — | @@ -810,7 +810,7 @@ |
| 811 | 811 | * Return a comma-delimited list of "flags" to be passed to the log |
| 812 | 812 | * reader for this block, to provide more information in the logs |
| 813 | 813 | * @param $data Array from HTMLForm data |
| 814 | | - * @param $type Block::TYPE_ constant |
| | 814 | + * @param $type Block::TYPE_ constant (USER, RANGE, or IP) |
| 815 | 815 | * @return array |
| 816 | 816 | */ |
| 817 | 817 | protected static function blockLogFlags( array $data, $type ) { |
| — | — | @@ -827,7 +827,7 @@ |
| 828 | 828 | } |
| 829 | 829 | |
| 830 | 830 | # Same as anononly, this is not displayed when blocking an IP address |
| 831 | | - if( !$data['AutoBlock'] && $type != Block::TYPE_IP ){ |
| | 831 | + if( !$data['AutoBlock'] && $type == Block::TYPE_USER ){ |
| 832 | 832 | $flags[] = 'noautoblock'; |
| 833 | 833 | } |
| 834 | 834 | |