$this->mAllowUsertalk = 0;
# Check if we are looking at an IP or a logged-in user
- if ( $this->isIP( $this->getName() ) ) {
+ if ( $this->isAllowed( 'ipblock-exempt' ) ) {
+ # Exempt from all types of IP-block
+ $ip = '';
+ } elseif ( $this->isIP( $this->getName() ) ) {
$ip = $this->getName();
} else {
# Check if we are looking at the current user
}
}
- if ( $this->isAllowed( 'ipblock-exempt' ) ) {
- # Exempt from all types of IP-block
- $ip = '';
- }
-
# User/IP blocking
$this->mBlock = new Block();
$this->mBlock->fromMaster( !$bFromSlave );