| Index: trunk/phase3/includes/User.php |
| — | — | @@ -836,6 +836,11 @@ |
| 837 | 837 | $this->mBlockedby = 0; |
| 838 | 838 | $ip = wfGetIP(); |
| 839 | 839 | |
| | 840 | + if ($this->isAllowed( 'ipblock-exempt' ) ) { |
| | 841 | + # Exempt from all types of IP-block |
| | 842 | + $ip = null; |
| | 843 | + } |
| | 844 | + |
| 840 | 845 | # User/IP blocking |
| 841 | 846 | $this->mBlock = new Block(); |
| 842 | 847 | $this->mBlock->fromMaster( !$bFromSlave ); |
| Index: trunk/phase3/includes/DefaultSettings.php |
| — | — | @@ -985,6 +985,7 @@ |
| 986 | 986 | $wgGroupPermissions['sysop']['unwatchedpages'] = true; |
| 987 | 987 | $wgGroupPermissions['sysop']['autoconfirmed'] = true; |
| 988 | 988 | $wgGroupPermissions['sysop']['upload_by_url'] = true; |
| | 989 | +$wgGroupPermissions['sysop']['ipblock-exempt'] = true; |
| 989 | 990 | |
| 990 | 991 | // Permission to change users' group assignments |
| 991 | 992 | $wgGroupPermissions['bureaucrat']['userrights'] = true; |
| Index: trunk/phase3/RELEASE-NOTES |
| — | — | @@ -472,6 +472,8 @@ |
| 473 | 473 | * New maintenance script to show the cached statistics : showStats.php. |
| 474 | 474 | * New special page to list available interwikis [[Special:Listinterwikis]] |
| 475 | 475 | * Count deleted edits when regenerating total edits in maintenance/initStats.php |
| | 476 | +* (bug 3706) Allow users to be exempted from IP blocks. The ipblock-exempt permission |
| | 477 | + key has been added to enable this behaviour, by default assigned to sysops. |
| 476 | 478 | |
| 477 | 479 | == Languages updated == |
| 478 | 480 | |