Thijs/wiki.techinc.nl
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Well there was no problem in the first place. Nice work Werdna

Browse source
This commit is contained in:
Andrew Garrett 2007-01-07 07:57:54 +00:00
parent 5c54e58321
commit b342a81da0
2 changed files with 5 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
includes/Block.php
View file

@ -126,12 +126,6 @@ class Block
if ( $this->loadFromResult( $res, $killExpired ) ) {
return true;
}
$userObject = User::newFromId($user);
if ($userObject->isAllowed('ipblock-exempt') ) {
$address = '';
}
}
# Try IP block

5
includes/User.php
View file

@ -836,6 +836,11 @@ class User {
$this->mBlockedby = 0;
$ip = wfGetIP();
if ($this->isAllowed( 'ipblock-exempt' ) ) {
# Exempt from all types of IP-block
$ip = '';
}
# User/IP blocking
$this->mBlock = new Block();
$this->mBlock->fromMaster( !$bFromSlave );