diff options
| author | Pierre Schmitz <pierre@archlinux.de> | 2012-01-12 13:42:29 +0100 |
|---|---|---|
| committer | Pierre Schmitz <pierre@archlinux.de> | 2012-01-12 13:42:29 +0100 |
| commit | ba0fc4fa20067528effd4802e53ceeb959640825 (patch) | |
| tree | 4f62217349d3afa39dbba3f7e19dac0aecb344f6 /includes/User.php | |
| parent | ca32f08966f1b51fcb19460f0996bb0c4048e6fe (diff) | |
Update to MediaWiki 1.18.1
Diffstat (limited to 'includes/User.php')
| -rw-r--r-- | includes/User.php | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/includes/User.php b/includes/User.php index a584f39d..cebcf604 100644 --- a/includes/User.php +++ b/includes/User.php @@ -115,7 +115,6 @@ class User { 'deletedhistory', 'deletedtext', 'deleterevision', - 'disableaccount', 'edit', 'editinterface', 'editusercssjs', #deprecated @@ -2939,7 +2938,7 @@ class User { return false; } - return (bool)$userblock->doAutoblock( $this->getRequest()->getIP() ); + return (bool)$userblock->doAutoblock( wfGetIP() ); } /** |